diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-09-12 17:08:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-12 17:08:07 +0000 |
| commit | 0392ba5f72e08b38086c2c4344b93bc9525f8744 (patch) | |
| tree | d26ca91088c2d8bc8aba2767ba5d8bbd5655a4ca /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 121df5bc6d08bf0fa0bb5528a985225b8a902022 (diff) | |
| parent | ff5a0512ec5a7dc67c4ec0f6764de89d34d8bff4 (diff) | |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dev am: 89a94b706d -s ours am: d0d0fea3d6 am: ff058a78ec am: c64209fb6a -s ours am: 5252746fe0 am: b4913b7093 am: 6cd1142360 am: 4bdddadcc5 am: be95e1d91e -s ours
am: ff5a0512ec
Change-Id: Icd9cc186849eba7d03afe0456c92017be2f1dc4e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions