tree 6e9a99c86c379f7cd58347db307cc08e0e83e9e1
parent b06b16ee3338a0e8bdf97f89d792e264ffcd0a56
parent 41a0a8d5b442007cbb069ef6a75debe1e24faf16
author Marco Nelissen <marcone@google.com> 1318477383 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1318477383 -0700

am 41a0a8d5: Merge "Don\'t start playing music after ending a call."

* commit '41a0a8d5b442007cbb069ef6a75debe1e24faf16':
  Don't start playing music after ending a call.