diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-30 04:54:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-30 04:54:27 +0000 |
| commit | 9ed6bd83ff09092ca7ccab59d6ce2ed637bd143e (patch) | |
| tree | 8e95812d5231dbded671dca0050863595a093728 /tools/aapt2/diff/Diff.cpp | |
| parent | 9f6bd40108191462bf0d5e2205b35a46cbd74a3f (diff) | |
| parent | dbbdb6d0893541605e5ad4801de7b490d45bb5f4 (diff) | |
Merge \"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\" into lmp-mr1-dev
am: dbbdb6d089
Change-Id: I53e854c96f9bf68855ea949a640c4701e0b2ba5e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions