diff options
| author | Ivan Podogov <ginkage@google.com> | 2017-01-03 14:15:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-03 14:15:01 +0000 |
| commit | 0407c4a64ad371971e1336fda6d442b9435d3ca5 (patch) | |
| tree | 8ba989034e4d5fe8fc2e05438cb2f4ac3e22a25d /tools/aapt2/diff/Diff.cpp | |
| parent | 7273449a8b35a0e65bab90d803bdcad0c2a8dc81 (diff) | |
| parent | e337729543fd1bae9dbd0e82dfbce578a12c4e52 (diff) | |
Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 57f7c2db57" into nyc-mr2-dev-plus-aosp
am: e337729543
Change-Id: I741841d40df5a46e479160ab4e75b958eea9cc1e
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions