tree f4c0bec239b912bfca958274fe19464123fedb8c
parent 8630a50c3115542bc47c0c09fd31f56fa58c0cd0
parent d6de726692d8a420faae86300bc9e87c30733730
author Brian Carlstrom <bdc@google.com> 1343844767 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1343844767 -0700

am d6de7266: am 24777f8a: Merge "Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES."

* commit 'd6de726692d8a420faae86300bc9e87c30733730':
  Remove jsr305 from LOCAL_STATIC_JAVA_LIBRARIES.