tree 7774f4bf1a0986b05bef965ce62ab1cc2f9c1dfb
parent e337729543fd1bae9dbd0e82dfbce578a12c4e52
parent 171af67a69c630830d7c0df045bf3490eaf24ae0
author Android Build Merger (Role) <android-build-merger@google.com> 1483442313 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1483442316 +0000

Merge "Merge "In permission review mode, always request user's consent to toggle BT." into cw-f-dev am: 34624a5d83 am: 2dd60e81ad" into nyc-mr2-dev-plus-aosp