diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-30 23:52:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-30 23:52:52 +0000 |
| commit | 5d00354598d116652de476e68c89b3bc31473e31 (patch) | |
| tree | 6e17b4c522aab250c01bd9cd9851942c5f57b97f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 646c6bc085bc775ad1ec00c3a290e2a56e960ad7 (diff) | |
| parent | f5b8501759a71cac6cfddfb56c34a31d502c9c21 (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 am: fe3fec0558
am: f5b8501759
Change-Id: I1222f76c3c6ce3a3e904a96445670e7394b0669b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions