diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-09-14 15:26:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-14 15:26:36 +0000 |
| commit | 6d23578d090c1ead4e49edd38709818a47377f9a (patch) | |
| tree | f2f4103ac42a3eea7b66bd27da7569d0970ccd53 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8b70fb0869be93ffe47f2b5938ac1c75aa281e3d (diff) | |
| parent | a62951f28f0a2289a7e8bac34650b43e34143874 (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
Change-Id: I7f52c07986fbcb784b6b6b892b1c83977355c754
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions