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