summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorSiyamed Sinir <siyamed@google.com>2017-10-31 18:21:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-10-31 18:21:55 +0000
commit43c494cb9c23f8b2db23b00074d9dd931823250a (patch)
treecd21c4dbf17c7174448de34f99891e2e40a77de0 /tools/aapt2/java/JavaClassGenerator.cpp
parent88f92e101d35fabcb8bd06abef96e467f3f18b72 (diff)
parent6ad6e7f2f45367a2f031743dda3ea8814b4e3448 (diff)
Merge "Use calling user ID when calling isDeviceLocked" into mnc-dev am: a0c253d07a am: c275b77b03 am: 1f8536653b am: bc56010856 am: eeb90235bf am: eb863a6b2e am: b353fbcb7a am: 9422f6e991 am: cc2fcef375
am: 6ad6e7f2f4 Change-Id: Ieafefbc852220055c45d1a019def6f2ec9a6df4c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions