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:15:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-12-02 02:15:04 +0000
commit65f46e8e14094dbc355e1d5e82c270d03eb5cd02 (patch)
tree6ed41290737606a89f8f9b3a42590a7aa4d034d4 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3173494043f87acb5798194592b6288947a26b42 (diff)
parent6f4bb40996d6cb66b0f429eb4fc769995e277e35 (diff)
Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am: 32d2b4c7af -s ours am: 18ade37c6b am: 05318c125f am: 68979dd543 am: 4529abc0f7 am: 1c0fa9c717" into nyc-mr2-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions