tree 7b250dc8479ed385be236944e8ad08bb21be441a
parent 0c32d01e2363a700694cd0b394a44666d1c3293a
parent a25222f5dcc68815b012e2b3c2822ed80683af57
author Adam Lesinski <adamlesinski@google.com> 1408123924 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408123924 +0000

am e9e52a2a: am 41cdc4c7: Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev

* commit 'e9e52a2ae2e80286447767b9a83b04d88c41c112':
  Revert "Fix aapt dump for APKs with no resources"