tree 509b165a9c92abd77498666313483d9216648e5b
parent 3b362bebfc0e322085a49ab732b4865b92240dd1
parent c2fab76f691ddc1928f81c79aad26f047c02b5c4
author Jean-Michel Trivi <jmtrivi@google.com> 1281408800 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281408800 -0700

am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button event from the phone app is the phone is ringing, even in silent mode." into gingerbread

Merge commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b' into gingerbread-plus-aosp

* commit '66edf558a9041eb0b1a7fc0459db1bdafcfca84b':
  Fix bug 2684341 Don't steal the media button event from the phone