OSDN Git Service

Merge "Add Bluetooth toggle prompts - framework" am: a062ce698b -s ours am: 98f664b903
authorMarie Janssen <jamuraa@google.com>
Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Oct 2016 02:56:54 +0000 (02:56 +0000)
am: 7ad32238f6

Change-Id: If8fa652d1e8607e801f668a3987c0019064472a6


Trivial merge