summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSiyamed Sinir <siyamed@google.com>2017-09-12 01:39:50 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-12 01:39:50 +0000
commit2135d23dcca4904ed8d3d3392e40c12042b22b10 (patch)
treeb356d3c325308e774535506458e145a2108018aa /tools/aapt2/java/JavaClassGenerator_test.cpp
parentcbc6212856466c3ed4555d3c40d4877500248559 (diff)
parentba7d98210eef42561d44dc678701e2c96d41462b (diff)
Merge "Prevent getting data from Clipboard if device is locked" into mnc-dev am: 06183a57a6 am: 028ad8d498 am: 6352ced635 am: 064bfd22be am: 8393b54d3e am: 954b6e9b74 am: 5288fcc242 am: 4d91e69c82 am: 7359d93942 -s ours am: b2ba32be69 -s ours am: 121df5bc6d -s ours
am: ba7d98210e -s ours Change-Id: Ica932e9ac84c764412253decccbe608c534fe310
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions