diff options
author | Beverly Tai <beverlyt@google.com> | 2017-09-14 18:21:49 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 18:21:49 +0000 |
commit | 1b04fd60d5aaf13b3e4ef7d3e750be8b85d25f60 (patch) | |
tree | bb867022c3a28e56eeccc27f5694f4cdc00f83a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b0f6a1308b0204cf319c853b6607b9f04688f716 (diff) | |
parent | 6d23578d090c1ead4e49edd38709818a47377f9a (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61 am: a126d94892 -s ours am: 2435c816d8 am: a62951f28f
am: 6d23578d09
Change-Id: Ia55fa862dc46672d4fa6c49a1a2da5c4ad091a06
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions