tree b056abaf021a784b88d0f5253cf1bd2e0caf409f
parent 76451706d86daaf38889254f56e47ba989619b9c
parent 840f9d0a274cffbef790dc20cd4f9eec27c3841b
author Ying Wang <wangying@android.com> 1375466723 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1375466723 -0700

am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"

* commit '840f9d0a274cffbef790dc20cd4f9eec27c3841b':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt