OSDN Git Service

Merge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours am: ce2a10b74...
authorMarie Janssen <jamuraa@google.com>
Fri, 28 Oct 2016 03:22:57 +0000 (03:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Oct 2016 03:22:57 +0000 (03:22 +0000)
commit83f1d4198b4d47f64c0ada7448fdd418f0d65a9a
tree5cf2db2ddab0f49226acf445396dce8e67f9d0d3
parent91ca01ec42070130b8cba74a18c8c17c221bf404
parentcd9d948d7e56071fd85a96de151b13268dc22b94
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours am: ce2a10b743 am: 6e8a67c008
am: cd9d948d7e

Change-Id: Ife5f94841073fb9c0af202b2470f50bab165e398