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

* commit '17a4a0bd410f6133fd9088828f27e598ec9d268b':
This commit is contained in:
Adam Lesinski 2014-05-12 23:31:29 +00:00 committed by Android Git Automerger
commit 404d21450a

Diff content is not available