summaryrefslogtreecommitdiffstats
path: root/MODULE_LICENSE_APACHE2
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2013-04-11 14:58:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-04-11 14:58:13 -0700
commit6e2157456a38c7b4db37ddba8c14caed2f0576c2 (patch)
tree9a1c86e9f9a49f6173e74cf543ef28d5c0c811ce /MODULE_LICENSE_APACHE2
parent3e4e221e6dd0e5c6fd4ef6036a37b166bd1053e4 (diff)
parentc5931edb4c8d95e90ac739ec88d8fca2610a57f1 (diff)
downloadframeworks_base-6e2157456a38c7b4db37ddba8c14caed2f0576c2.zip
frameworks_base-6e2157456a38c7b4db37ddba8c14caed2f0576c2.tar.gz
frameworks_base-6e2157456a38c7b4db37ddba8c14caed2f0576c2.tar.bz2
am c5931edb: am c65e4633: Merge "Optional <uses-permission> not yet supported." into jb-mr2-dev
* commit 'c5931edb4c8d95e90ac739ec88d8fca2610a57f1': Optional <uses-permission> not yet supported.
Diffstat (limited to 'MODULE_LICENSE_APACHE2')
0 files changed, 0 insertions, 0 deletions