summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-09-15 07:26:33 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-09-15 07:26:33 +0000
commit3d02472f0b4df241b06917991b33a6f11211d5a9 (patch)
tree358f430be2afcae317a5c8dd7181f92328d6fdb6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent97fb5d7c67377f01b448df8c72fec597147f14b8 (diff)
parent86d007cc5a1a2b6ab10c349270f5be4bf3db9f40 (diff)
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d09a -s ours am: fe5ce91c5f am: 7c8a60c3e4 -s ours am: 588c61bb06 -s ours"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions