summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-10-19 21:18:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 21:18:55 +0000
commitdfbaa1fd8bc6aadd4b84a2548d17af85cca6b4cc (patch)
treefe35ca643838769dd856507bdc0ac0ebe21459ef /tools/aapt2/java/JavaClassGenerator_test.cpp
parent159648d6e5f8f2faa402c2bbfe7249e3616e9489 (diff)
parentf2b592726d569cd0ca6dc702def29deca593ee48 (diff)
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev
am: f2b592726d -s ours Change-Id: Idd1243bb1cddc91f34f6e47e9cea88b72cff29d0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions