diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-09-14 18:23:38 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-14 18:23:38 +0000 |
commit | 1a2c28c9f4c50af9f6c9b4435acc40dd0206c300 (patch) | |
tree | a6796f7b2d387ccc2762e55a1664ca2d577ec374 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 295ce6ea5b6028f9c6b7ac53029f7af6905947c1 (diff) | |
parent | 1b04fd60d5aaf13b3e4ef7d3e750be8b85d25f60 (diff) |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61 am: a126d94892 -s ours am: 2435c816d8 am: a62951f28f am: 6d23578d09" into oc-mr1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions