tree 84230245b6d0620425180d5fab12ff558de999ab
parent de585a6344bc4968efed70a4d4cbfe3ab01978b7
parent 147ef4743d8ae120028c7286d37cba58a2c0d43e
author Nancy Chen <nancychen@google.com> 1440685112 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440685112 +0000

am 147ef474: am 43bc27c3: (-s ours) am fb229aa0: Merge "Reset voicemail playback when call log is paused." into mnc-dev

* commit '147ef4743d8ae120028c7286d37cba58a2c0d43e':