diff options
author | Beverly Tai <beverlyt@google.com> | 2017-09-14 18:34:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 18:34:53 +0000 |
commit | 7860f1cd787c55c87070c6c845842fcebebd553e (patch) | |
tree | a6796f7b2d387ccc2762e55a1664ca2d577ec374 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4fc8f1f9b41d7dce4c448f9f2cffca9cb5172eb0 (diff) | |
parent | d0c9f402d50c84b5498faa1262418403ab379e35 (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours am: 95e10b296e am: c3e2d40309
am: d0c9f402d5
Change-Id: Id0e718caf1663ff8e7c27a7b39a795dd8d3afc37
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions