summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-10-19 21:50:59 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 21:50:59 +0000
commit06bd19c1fbebdc0daed36fcb12e3c3cb94d7c80c (patch)
tree1acefac006e5f72b7be101808e673ee4018c79b6 /tools/aapt2/java/JavaClassGenerator.cpp
parent8fb52c8d062e3f3b407a79bc0ede544a1f1bbd11 (diff)
parentd7ece4da2caaaab1831879347f642464176b01d5 (diff)
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-mr1-dev am: f2b592726d -s ours am: dfbaa1fd8b
am: d7ece4da2c Change-Id: Icfd3af47bed5a40d23d1a48ecbb654625898ca2f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions