summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-10-11 21:38:31 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-11 21:38:31 +0000
commitdc5d89e59ac53a0c452cb0b61ac479461a87da5f (patch)
tree3316ef90ac83437e0d0aaf1e831cb8ff40b273cb /tools/aapt2/java/JavaClassGenerator.cpp
parentfd39b2375fbe5db685d2c3819ccbf4edc2b87dee (diff)
parent68408918c27987204b5fbd6be4ea87bbede7663a (diff)
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into nyc-mr2-dev am: 09984216e6 -s ours am: 5f17a285f9 am: 98371ee7c9 am: e6f60d0fcb am: 4a69ee914c -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions