From: Marie Janssen <jamuraa@google.com>
Date: Fri, 28 Oct 2016 03:22:57 +0000 (+0000)
Subject: Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours am: ce2a10b74... 
X-Git-Tag: android-x86-8.1-r1~1416
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=83f1d4198b4d47f64c0ada7448fdd418f0d65a9a;hp=91ca01ec42070130b8cba74a18c8c17c221bf404;p=android-x86%2Fpackages-apps-Settings.git

Merge "Add Bluetooth toggle prompts - settings" am: de037d5491  -s ours am: ce2a10b743 am: 6e8a67c008
am: cd9d948d7e

Change-Id: Ife5f94841073fb9c0af202b2470f50bab165e398
---