diff options
author | Beverly Tai <beverlyt@google.com> | 2017-09-14 17:29:37 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 17:29:37 +0000 |
commit | ba55b3bea6014ffb993eb88422290cc72104d634 (patch) | |
tree | bf19400e6e3b87f7ded336a2e31f87edea54ebd1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a126d94892655e07f69248f67baaf90d9d25c2ee (diff) | |
parent | 8462da779bbe6675123985218c4bd168f8b8e1bc (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2
am: 8462da779b
Change-Id: Ibbfa865f666f174b307fbe7a50ac73030d4a5c01
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions