summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSiyamed Sinir <siyamed@google.com>2017-09-12 01:53:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-12 01:53:53 +0000
commit375d6dff81e659c0beee07fc5d43f07ca68285a9 (patch)
tree3b12f60dec95ad89255cf626246ce6e305f6532d /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3aeb757dbf13eec976d0e133b78cac002f7f73ff (diff)
parentdd5fc73944e3e32401fb53b27345ac4d8553f100 (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: 428f7402ba -s ours
am: dd5fc73944 -s ours Change-Id: I999efafd61f5f21d3405a28ddb4b0722bf0304c3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions