summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSiyamed Sinir <siyamed@google.com>2017-09-11 23:25:46 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-11 23:25:46 +0000
commit1ae69adf4a44573bc6cf3cd5ef198acb62211de8 (patch)
tree5c901154d363187e0ce541948b5bc9da412ba087 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc0a0a08ee8aa85e9f6bc2688d0791d0c7c485d40 (diff)
parent529c7ea9bd2d9340898cc5be3dec60a457e9c561 (diff)
Merge "Merge "Prevent getting data from Clipboard if device is locked" into oc-dev am: 846a46043c am: 491aaaae43" into oc-dr1-dev-plus-aosp
am: 529c7ea9bd Change-Id: I948bc394d3904a1c7e7245b539cd004ce8fccad1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions