summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-10-19 22:56:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 22:56:23 +0000
commit791d8a5b16e89e97c90d57e7839bffb0793e7de2 (patch)
tree9ea86adf4b5f09195f56560b94f9a27db20339e7 /tools/aapt2/java/JavaClassGenerator.cpp
parenta4454ba4a96a1c47d25d0f4128e3ce4132f0486d (diff)
parent5fda53b294aa73304b60a6287103a6423c922cb1 (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 Change-Id: Idda35731b13787fb00e0c7474eebc5b7d8660251
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions