OSDN Git Service

Merge "Add Bluetooth toggle prompts - settings"
authorMarie Janssen <jamuraa@google.com>
Fri, 28 Oct 2016 02:45:39 +0000 (02:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Oct 2016 02:45:39 +0000 (02:45 +0000)
am: de037d5491  -s ours

Change-Id: I4d809fb02c07ad366b6e5954ac3c0dbc0f5c597d


Trivial merge