diff options
author | Sudheer Shanka <sudheersai@google.com> | 2017-01-14 00:17:40 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-01-14 00:17:40 +0000 |
commit | 3102b3c37f7273fd363a41d1b23d2d4fa7df7a54 (patch) | |
tree | 31037abd311d326adfb760f265ae7b186f506f13 /tools/aapt2/diff/Diff.cpp | |
parent | 906a21ba084aed7b213653782d1d4b8269b56dd2 (diff) | |
parent | bdd0a2b14ab1da5c739c2658aa94f87daa9b3c04 (diff) |
Merge "Emulator: Fix CTS failure caused by removed MANAGE_USERS permission in Shell" into nyc-mr2-dev
am: bdd0a2b14a
Change-Id: I4697f24ecef7cc439c94352ba2aaf98cf34bbe61
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions