tree 5ba7e08e5ce0be136552149fd5de4f7e3ba033e2
parent 46c95cfd73181eb534d65a0b97b23e0df06e46d7
parent 0dedb6b1c809ebad637021782b3bdd1abc9970be
author Nicholas Sauer <nicksauer@google.com> 1420000571 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420000571 +0000

am 0dedb6b1: Merge "[FM] "Speaker on/headset" should not be available while BT earphone is connected" into lmp-mr1-dev

* commit '0dedb6b1c809ebad637021782b3bdd1abc9970be':
  [FM] "Speaker on/headset" should not be available while BT earphone is connected