am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs when media...
am d1559d6b: Merge "Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call." into gingerbread
Merge commit 'd1559d6b' into gingerbread-plus-aosp
* commit 'd1559d6b':
Fix issue 2301630: Mismatch of state occurs when media server is killed while in-call.