summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-09-14 18:28:41 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-14 18:28:41 +0000
commita24d46cff199b41c4fd2ba601e3f8118259a8e81 (patch)
treea6796f7b2d387ccc2762e55a1664ca2d577ec374 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent1a2c28c9f4c50af9f6c9b4435acc40dd0206c300 (diff)
parentbb7fc483f06fc4b95d6c41f619acfbf939e208d5 (diff)
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours am: 95e10b296e am: c3e2d40309
am: bb7fc483f0 Change-Id: Iafccb0596c104fab9aceb428a082f55b804f02cf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions