diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-07-30 06:49:33 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-30 06:49:33 +0000 |
commit | ea60ad51735bdc2aa187e0073db7be6c62a047e0 (patch) | |
tree | 192475d91e88bc37fda2bfac7ce3ce6423bfa1a8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | a8ff98fbce6433d49fb5957a7dd2604cec7bc938 (diff) | |
parent | 9a7c0670343fc722d8667e0098d9a87eb5333a62 (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
Change-Id: I6808755cfd17d41a7cbcbfb54b619eba535b6570
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions