diff options
| author | Beverly Tai <beverlyt@google.com> | 2017-09-15 04:46:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-15 04:46:52 +0000 |
| commit | 4638ea9dab573c33357127be4a4b150e7ac7d6da (patch) | |
| tree | a12a88195a24e91cb0162d0bbc326d2d01b6ba09 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fb291cef5cab19f7571b3aa357e5297386fa294c (diff) | |
| parent | 0bf8100ff54edbd26a27d6bc1d8ac041fb49d51c (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: f4e23cbcfa
am: 0bf8100ff5 -s ours
Change-Id: I813b0592a297df79e5a5a27af79297fca8894c7b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions