diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 22:42:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 22:42:23 +0000 |
| commit | b0de5fd328b04ba89b09915dd367014d6536dc02 (patch) | |
| tree | eaa0b0b1126ab15d4719c4d50273da69d55d049c /tools/aapt2/diff/Diff.cpp | |
| parent | a5e89439ff6cf0d4a3ab32b56418130b02fa3946 (diff) | |
| parent | 4e8aa0f35f86b574a75b802e86c0b70e3ea2fbd4 (diff) | |
Merge \\\\"Add pm operation to set user restrictions.\\\\" into mnc-dev am: 144b3a42cc am: f43aa2e837 am: 916728bb35
am: 4e8aa0f35f -s ours
Change-Id: Id82e4921ebc46dcf802acad895410ed79026d9ce
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions