summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-02-09 19:50:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-02-09 19:50:58 +0000
commit3b7ee3598f841a1c73a26b834a3ec9e2431924ae (patch)
treec65af19924ca65478dabfd08577e052dcc0bb759 /tools/aapt2/java/JavaClassGenerator.cpp
parentbbdec11843b660d6e7711f847b9ceb6495027b29 (diff)
parent91aac0db54eb4d7d9ca32a7350322b716b10e649 (diff)
Merge "DO NOT MERGE. Grant MMS Uri permissions as the calling UID. am: 78f2e38a12 -s ours am: b30169299b -s ours am: 31c7fa003d -s ours am: 966e600365 -s ours" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions