summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-07-30 07:13:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-30 07:13:57 +0000
commit68887cf986b17ad5e5ffa1df945896e2e85b029a (patch)
tree40f196b6408a0390de062bca29af183937d40d02 /tools/aapt2/java/JavaClassGenerator_test.cpp
parentc62c942adb5ecdf0d866e3b6ae4cee53566b9a3c (diff)
parent3cfa1bb8ecc3a9cadf80e99811dde6fdfbe4a3bb (diff)
Merge \\\\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9 -s ours am: 98ae56902e am: 382f9aadcd am: 9457779aa4 am: 247edeb721 -s ours
am: 3cfa1bb8ec Change-Id: Id82215d3e65497f7688895689bb88776aa8bc1ce
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions