tree 8924d31ff2ecb8b544ab35dab62f515aac397156
parent b425be0870d9396e4b0be677a7c0996b6aadfe37
parent 43bc27c3f9255f8480661088c61e7cbb50e9095a
author Nancy Chen <nancychen@google.com> 1440674482 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440674482 +0000

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

* commit '43bc27c3f9255f8480661088c61e7cbb50e9095a':