summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-10-19 23:37:21 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 23:37:21 +0000
commit260ef208accffe768143cdab117c186917bcb03f (patch)
tree2a11afc6708a91bb49c2bd8f5dec6d0fade7d5a7 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent02d89a3c0c4a9b74bc6569ffad1509091275328e (diff)
parent4dd01948c18d6f97be6fc7e69bb3d051375a3d39 (diff)
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b am: d7ece4da2c am: 06bd19c1fb am: 7b1157a92e -s ours am: bcdb9079ef am: 5fda53b294 am: 791d8a5b16
am: 4dd01948c1 Change-Id: I7426cd9b8f68f80a924662b4870558974bad347b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions