diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-30 07:42:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-30 07:42:24 +0000 |
| commit | f5b8501759a71cac6cfddfb56c34a31d502c9c21 (patch) | |
| tree | 2a239202081571ffea907bd0a9c28e764ed4a7ec /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1bc1e2a34807e937671213ebfaef598c06be11f6 (diff) | |
| parent | fe3fec0558e30cc59dd7d345cc4075451fd3bf22 (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
Change-Id: I63971e59a00269af7b2ffbb9f5167c92ba96fddf
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions