From: PauloftheWest <paulofthewest@google.com>
Date: Mon, 15 Sep 2014 23:56:07 +0000 (+0000)
Subject: am 56b3f338: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings... 
X-Git-Tag: android-x86-6.0-r1~671^2~550
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=771fd894;p=android-x86%2Fpackages-apps-Settings.git

am 56b3f338: am 654517a5: Merge "Fixed a Null Pointer Error in Bluetooth Settings." into lmp-dev

* commit '56b3f338e7bc85d30f56eafce4d6d0dc2dd46e3b':
---

771fd894b7ceff7b6c93157881fb7cacf138f478