tree 3ebb7f292d9d92f69f397da8330e91ccd4995897
parent c22597a3807b99580436813149de305a39b2c548
parent a2cd733c23a8382af54249cfddcd73b9e784103a
author John Spurlock <jspurlock@google.com> 1402025556 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402025556 +0000

am 01566c37: Merge "QuickSettings: Bluetooth updates." into lmp-preview-dev

* commit '01566c37846b7ad9e4173f2ae50de78ca8c05495':
  QuickSettings: Bluetooth updates.