OSDN Git Service

Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework" am: 47e1f497c0 -s...
authorMarie Janssen <jamuraa@google.com>
Mon, 12 Dec 2016 21:40:10 +0000 (21:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Dec 2016 21:40:10 +0000 (21:40 +0000)
am: 964f769d63  -s ours

Change-Id: I3bf8b667f00da5c517d382a7e710b1556a41116e


Trivial merge