diff options
author | Beverly Tai <beverlyt@google.com> | 2017-09-15 07:24:35 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-15 07:24:35 +0000 |
commit | 86d007cc5a1a2b6ab10c349270f5be4bf3db9f40 (patch) | |
tree | 358f430be2afcae317a5c8dd7181f92328d6fdb6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 0dd2f36ea4afaa9593a84473af4029654c38c97d (diff) | |
parent | 588c61bb062d5be073a198c5c13952b055740d70 (diff) |
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d09a -s ours am: fe5ce91c5f am: 7c8a60c3e4 -s ours
am: 588c61bb06 -s ours
Change-Id: I8ecba9c30415679608ab74bc53c381d49c3db8b6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions