From: Ajay Panicker <apanicke@google.com>
Date: Wed, 5 Aug 2015 18:43:17 +0000 (+0000)
Subject: am e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settin... 
X-Git-Tag: android-x86-7.1-r1~1235^2~319
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=21eff785;p=android-x86%2Fpackages-apps-Settings.git

am e396c224: am f1ffec39: am 1dd985ab: am cd8acb22: Merge "Implement Bluetooth settings factory reset (5/5)" into mnc-dev

* commit 'e396c2241ff629bcfd60bd3caf3fe2da7637dee6':
  Implement Bluetooth settings factory reset (5/5)
---

21eff785a77c907724a9d44c06ff5c4c66204f3b