| commit | ecc5b4363571688cb257c2bc9c5e24653efb86f4 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Thu Apr 04 17:27:42 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 04 17:27:42 2013 -0700 |
| tree | 14a1f0364b6601bf42dcaaa96e307a70394885e9 | |
| parent | 21af446ce9704bdc465bf15755148c5de50ea019 [diff] | |
| parent | 745a42bbb9db8d54af5381ef5fe41828bf6fc352 [diff] |
am 745a42bb: Merge "aapt: add support for optional uses-permission" into jb-mr2-dev * commit '745a42bbb9db8d54af5381ef5fe41828bf6fc352': aapt: add support for optional uses-permission