diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-07-30 07:06:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-30 07:06:15 +0000 |
commit | fe3fec0558e30cc59dd7d345cc4075451fd3bf22 (patch) | |
tree | 9122491fefad7b4b041eecd20be070c701fa5afe /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 92f00c6b5de1b3033c37fc70dde4a0f9127fc3a1 (diff) | |
parent | 3cfa1bb8ecc3a9cadf80e99811dde6fdfbe4a3bb (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: I365b65c49c0380379e8aa64661c0da5046bbc2e3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions