tree 1bb4df5c8b998121784951c092019c0fc455b1da
parent 8853f5181b1ae1682d9433c28e120f25f63a4721
parent ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9
author Ying Wang <wangying@google.com> 1427490579 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427490579 +0000

am ddc5a8f7: am 8ffec13d: Merge "Add back Java resources to apk without Java code."

* commit 'ddc5a8f78c1e5a180bb23878b4f47b68a91f8ed9':
  Add back Java resources to apk without Java code.