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