diff options
author | Android Build Merger (Role) <android-build-merger@google.com> | 2017-01-03 11:18:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-01-03 11:18:29 +0000 |
commit | e337729543fd1bae9dbd0e82dfbce578a12c4e52 (patch) | |
tree | 7774f4bf1a0986b05bef965ce62ab1cc2f9c1dfb /tools/aapt2/diff/Diff.cpp | |
parent | 03b1d5208883dca4c0ac906d9ec6ac1537ef3e00 (diff) | |
parent | 2518fb03dcdb02c38927804cda8250dc5a283003 (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
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions