summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAndroid Build Merger (Role) <android-build-merger@google.com>2017-10-31 19:23:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-10-31 19:23:26 +0000
commit5dce48b47f2f32a5b7464adcf2fe93639f04a722 (patch)
treef2765df0ca1c4cf3faa8cba7ee2ba1a62f22748e /tools/aapt2/java/JavaClassGenerator.cpp
parentf30e0cfca03294ec37c02e2d3d4cdeb6784804ef (diff)
parent56cc12bdd0b048abe061e09396981eaaf10a6f9f (diff)
Merge "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 am: 43c494cb9c am: d08f60ba71 am: a3b1a48d4c"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions