diff options
| author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-01-20 02:00:07 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-20 02:00:12 +0000 |
| commit | fdf9a1b7208a78eea7db3440b5df885c76049add (patch) | |
| tree | 8d9e19e723ec7cc6ac672ce6a8cb948261a8b61e /tools/aapt2/diff/Diff.cpp | |
| parent | 24fac986ecad9a4c8b7ccdf545abebbfc0532678 (diff) | |
| parent | 412636aa629a3ac911aa71e333f36ffbaee3aa86 (diff) | |
Merge changes from topic 'am-e50edd437cbb475fa514e750559a7e14'
* changes:
Merge "Use separate switch ops for runtime permissions am: e710a6fc66 am: a2bbc26979" into nyc-mr2-dev-plus-aosp am: 583d798e41
Use separate switch ops for runtime permissions am: e710a6fc66 am: a2bbc26979 am: 49dc9048fd
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions