OSDN Git Service

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

Change-Id: Ifa6abd776e6752c0eb1ac0bc41d51f9ebdddc490


Trivial merge