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)
commit964f769d63e120ce93c338a78bbf642366fec1ec
treee33937add212a5437cf8ae55bb4dff754b720322
parent2bc66bf601081928fb46e2727ec6d825f128bf26
parent47e1f497c0f457fd010e35d7aba1c9987fd9ea0f
Merge "DO NOT MERGE Add Bluetooth toggle prompts - framework"
am: 47e1f497c0  -s ours

Change-Id: Ifa6abd776e6752c0eb1ac0bc41d51f9ebdddc490