summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorSiyamed Sinir <siyamed@google.com>2017-10-19 03:59:12 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-19 03:59:12 +0000
commit77c982f28b8d1128d6bec0fcc814f4ec818576bd (patch)
tree9bd8b076e19034ee9c07ad53310fac74e4d03702 /tools/aapt2/java/JavaClassGenerator.cpp
parent9a7a6e20009c4e21062ed8e2e8b6a726e4dc56f5 (diff)
parent5cf9cbd3a38a9630a892d48b26b3a511a9e4489a (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
am: 5cf9cbd3a3 Change-Id: I4d24939ad00fdf262e8a81c2a2468645093601cf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions