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:26:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-11 21:26:04 +0000
commit383ab095f5793a7ed9c3151ecbaddeb869e8abc2 (patch)
treefbb49e11ea3f27b0689d4715be7480efe5cfe972 /tools/aapt2/java/JavaClassGenerator.cpp
parentb9629cd4324446201d12db86b2a00ffce23bbe0e (diff)
parent69e02608d56437ed5b6797a9f7a558aa8ac47ff7 (diff)
Merge "Merge "DO NOT MERGE. KEY_INTENT shouldn't grant permissions." into oc-dev am: 31c5adc279 am: 3f671b3194" into oc-mr1-dev
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions