summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-07-30 07:42:20 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-30 07:42:20 +0000
commitfff615adcbe34a33daebdabcf73e5b75a57bf030 (patch)
tree2a239202081571ffea907bd0a9c28e764ed4a7ec /tools/aapt2/java/JavaClassGenerator_test.cpp
parent9b0cc5de5ff3fc704df6404a940e5bb7adb66ff5 (diff)
parent54aeda8e7f5264353a3ab66f7fba84e5159a0d8d (diff)
Merge \\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\" into mnc-dev am: e140322bde am: 088e081ac1 am: 72f9d1ff97 am: 9a7c067034 -s ours am: ea60ad5173
am: 54aeda8e7f Change-Id: I4b84029c3b8893e0e1f1cff36e12d374cdfe16f5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions