tree db34eca2da5ec1662b262862fc44c323209fcb14
parent 48ea32b2bf6db6e339050f55c5d5b6a3874a5c4d
parent 17a4a0bd410f6133fd9088828f27e598ec9d268b
author Adam Lesinski <adamlesinski@google.com> 1399937489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399937489 +0000

am 17a4a0bd: am 9bbbac75: Merge "Change aapt flag to use new name"

* commit '17a4a0bd410f6133fd9088828f27e598ec9d268b':