summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2016-12-02 02:14:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-02 02:14:12 +0000
commit3173494043f87acb5798194592b6288947a26b42 (patch)
tree6ed41290737606a89f8f9b3a42590a7aa4d034d4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent4c163a060fd055b4629cce44ec1019c5acf3885a (diff)
parentf71bc980dd27d330976341fae6f9f8b582152061 (diff)
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s ours am: d9a7f11334 am: 2436f1e49d am: 90efb1a88d am: 25a7e0e952 am: 15aa9cb01a" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions