OSDN Git Service

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

Change-Id: I6dabd16f5334e78bc05e6b5ffb95a0177a3cd4d7


Trivial merge