summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-09-15 07:30:37 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-15 07:30:37 +0000
commit29c8b112bfeb5eac369ad9da6f2d5071894dbcfc (patch)
tree358f430be2afcae317a5c8dd7181f92328d6fdb6 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent437a0278dee8d881ce766c5749e879c917b72927 (diff)
parent9eb5f2cd64c92e1e2b5b7793711a0a61b4635e26 (diff)
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev am: d740b2d09a -s ours am: fe5ce91c5f -s ours am: 9fbf077e80 -s ours
am: 9eb5f2cd64 -s ours Change-Id: Ib24fadaf19a0f200d0718e2e0aa863de3dd67054
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions