summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-10-19 23:11:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 23:11:55 +0000
commit4dd01948c18d6f97be6fc7e69bb3d051375a3d39 (patch)
tree62a5e3f6fe7528059efffdcb4dd2f83b667df4e0 /tools/aapt2/java/JavaClassGenerator.cpp
parent29257874f9c548811285e874117d98aaeeb9b9d5 (diff)
parent791d8a5b16e89e97c90d57e7839bffb0793e7de2 (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 Change-Id: I0678613fd0293afeafa38c4ac9fb0a55fb4b3969
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions