diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-09-12 17:17:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-12 17:17:52 +0000 |
| commit | 108e142d617cf3356a333579bf0805889cac92d8 (patch) | |
| tree | 53a476c4085bc6f0cd270d72daedc4a32991860f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2cf8f74180d8296a66c93932f7c850ba2a17af14 (diff) | |
| parent | 0392ba5f72e08b38086c2c4344b93bc9525f8744 (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
am: 0392ba5f72
Change-Id: Ife88f86f94919d731e79f7ec5838b14fbb30a4cc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions