am 2f5f154d: 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
am 2f5f154d: 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 '2f5f154d6a090b4ea2ee3645857f2fcae88daa54'

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

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base