tree ed2a7ae9c564d6f2c24b509e937605777759530c
parent 240d52cb96867042fce050f832ee4290e758a0a4
parent a644c01db212601c478f46f6914536fadc6cf8f7
author Jason Monk <jmonk@google.com> 1427294473 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427294473 +0000

am a644c01d: (-s ours) am 4c1a49fc: am 039013c2: Merge "Sort Bluetooth devices in quick settings by name"

* commit 'a644c01db212601c478f46f6914536fadc6cf8f7':
  Sort Bluetooth devices in quick settings by name