summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-07-30 23:52:43 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-30 23:52:43 +0000
commit21f97c6cce5813026822e91e5c2070d92c172a86 (patch)
tree6e17b4c522aab250c01bd9cd9851942c5f57b97f /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6428499d6e42192eea8734e6557db4c25ee766f7 (diff)
parentfff615adcbe34a33daebdabcf73e5b75a57bf030 (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
am: fff615adcb Change-Id: Ifb286fb6d6caefc6f0b52cadb8306f0f85ee32b8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions