tree be4ce7afed9f502dcf5d0bd715625ff302928bc9
parent e6e3019afea5956c7f1e50815701953e185d2392
parent 838b8ed7a5f84da95dc7042cdfc0123c734d5303
author Yorke Lee <yorkelee@google.com> 1411849602 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411849602 +0000

am 720686d9: am 63c85b7b: Merge "Fix for not being able to return to InCallUI after accepting call via BT" into lmp-dev

* commit '720686d941ecdb3fe32f8ffbd7b3b2aafa112f6c':
  Fix for not being able to return to InCallUI after accepting call via BT