tree 956da55ebb860a9c82b63d7c445e65f4eab1ac85
parent d6adc769e6ef1f4ad3d9687a665570ecce060593
parent 0d320263deae0fe0d8d33962a95b200223561358
author Yorke Lee <yorkelee@google.com> 1412019916 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412019916 +0000

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

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