summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-10-19 22:20:11 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 22:20:11 +0000
commitbcdb9079efc2a1ce3ad27e25f10d94b30a7031a0 (patch)
treefbb0f18b72dc8626f8d88a887e41ad2502eebf14 /tools/aapt2/java/JavaClassGenerator.cpp
parent55ffaea04b00927ec259f1a0279b1be199c69b8b (diff)
parent7b1157a92edb5c531238b8f0d9092d3e41d84786 (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 Change-Id: I0e451cfd8bf662d959ace4f79b1181d27fce79e1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions