summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorBeverly Tai <beverlyt@google.com>2017-10-19 02:48:23 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 02:48:23 +0000
commitb00fd6bb97941d0f154bc479b110ca54a2d0cb7d (patch)
tree62a5e3f6fe7528059efffdcb4dd2f83b667df4e0 /tools/aapt2/java/JavaClassGenerator.cpp
parent8621a28b04dc488763e21ecd65f24b37310b78cb (diff)
parent7fd4bec14aaf0e3d30eb6546ef7501d38a76d32d (diff)
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into lmp-dev am: e1adf2240f -s ours am: 3ca0cc0ae6 -s ours am: 01ae445966 am: 3d600ede6d am: d34366e714 am: 9b0a6a3509 -s ours am: f1a95220a3 am: c6ca9254ed
am: 7fd4bec14a Change-Id: Iadf94c4dcda9ae3e7a068838de87a4fadc18be7f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions