summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorSudheer Shanka <sudheersai@google.com>2016-07-30 06:57:38 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-07-30 06:57:38 +0000
commitd9e9cf0ab150fdc58173fdea3e1a76aba6ede98c (patch)
tree40f196b6408a0390de062bca29af183937d40d02 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6c43ea3376f1cb5b08e1cb3b7468edfebaf59f75 (diff)
parentea60ad51735bdc2aa187e0073db7be6c62a047e0 (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 Change-Id: I698f563a4006e4accf2febae0aba6061c46688a2
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions