summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSiyamed Sinir <siyamed@google.com>2017-10-19 03:43:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 03:43:28 +0000
commit5cf9cbd3a38a9630a892d48b26b3a511a9e4489a (patch)
tree24d09af8eff4d7a6ead181faa4c48b9982e0a137 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7f9454d63d8c0e8c60f404d3b24261dc8b6104b9 (diff)
parentb614e5560e67f0d3ba93e77839ddf8a99747aa3e (diff)
Merge "Prevent getting data from Clipboard if device is locked" into lmp-dev am: 9f496fbbe0 am: 4973227cbf -s ours am: dcdb0e6bbe am: b24023a7e0 am: c26e04b006 am: 2bab19f9aa am: 69cc90b01c am: 19a3c53841 am: 9950579eb5 am: 8621a28b04 am: 685b515140 am: 65f1a4c4c2
am: b614e5560e Change-Id: I34c80d0a98a7a4ea1c78f5ae8619e9566bb33476
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions