OSDN Git Service

Merge "Add Bluetooth toggle prompts - settings" am: de037d5491 -s ours am: ce2a10b743
authorMarie Janssen <jamuraa@google.com>
Fri, 28 Oct 2016 02:57:06 +0000 (02:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 28 Oct 2016 02:57:06 +0000 (02:57 +0000)
commitcd9d948d7e56071fd85a96de151b13268dc22b94
tree0e6a55b8c74a67047c52348562b338698d0741ba
parent10d6c409d4de30c5f2370381eeb0685f48232e60
parent6e8a67c008c713cab69bd0faf0d11bc25f99f527
Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours am: ce2a10b743
am: 6e8a67c008

Change-Id: I0fc40f9a3f3a8488e696727d08084f2d2b9d2d75