summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-04-05 00:22:58 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-04-05 00:23:11 +0000
commit745a42bbb9db8d54af5381ef5fe41828bf6fc352 (patch)
tree320320b05df750612e8af1cbb184e7b98b639c15 /core/java/android
parenta151ef8c667a52d9fae28c09f780784f19bdb039 (diff)
parent1bcc3d691fd1cb68abced62caf3024e2bb228561 (diff)
downloadframeworks_base-745a42bbb9db8d54af5381ef5fe41828bf6fc352.zip
frameworks_base-745a42bbb9db8d54af5381ef5fe41828bf6fc352.tar.gz
frameworks_base-745a42bbb9db8d54af5381ef5fe41828bf6fc352.tar.bz2
Merge "aapt: add support for optional uses-permission" into jb-mr2-dev
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions