diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-09-15 06:59:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-15 06:59:25 +0000 |
| commit | 7a6ab972ebbe4b0e9ddbcdb270b2563e5e129099 (patch) | |
| tree | f53f15c9e2de069ff57c5e5563ca4cc1b44daae8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8f40a01bfe8e2e2749ca79a149ed1404dc7aab24 (diff) | |
| parent | 295ce6ea5b6028f9c6b7ac53029f7af6905947c1 (diff) | |
Merge "Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b am: ba55b3bea6 -s ours am: ef696aa47b am: a35989b007 am: ba4b1cdcff" into oc-mr1-dev-plus-aosp
am: 295ce6ea5b -s ours
Change-Id: I8cb4d47e5ff6a396f0f7845e7545b6b10e181edb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions