| commit | c85336fd3323d0836b869faf427f70bee37e57f2 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Apr 04 17:34:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 04 17:34:29 2013 -0700 |
| tree | 2dcc02bde543f937e8d1fbc14815c549aef12a54 | |
| parent | f7648b7f24bc4cf8a66df4c0cfb5e8aa2b7d3ac8 [diff] | |
| parent | ecc5b4363571688cb257c2bc9c5e24653efb86f4 [diff] |
am ecc5b436: am 745a42bb: Merge "aapt: add support for optional uses-permission" into jb-mr2-dev * commit 'ecc5b4363571688cb257c2bc9c5e24653efb86f4': aapt: add support for optional uses-permission