tree 320320b05df750612e8af1cbb184e7b98b639c15
parent a151ef8c667a52d9fae28c09f780784f19bdb039
parent 1bcc3d691fd1cb68abced62caf3024e2bb228561
author Nick Kralevich <nnk@google.com> 1365121378 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1365121391 +0000

Merge "aapt: add support for optional uses-permission" into jb-mr2-dev