am 2f5f154d: am 66edf558: Merge "Fix bug 2684341 Don\'t steal the media button...
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 '2f5f154d'
* commit '2f5f154d':
Fix bug 2684341 Don't steal the media button event from the phone