OSDN Git Service

am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button...
authorJean-Michel Trivi <jmtrivi@google.com>
Thu, 11 Sep 2014 00:51:32 +0000 (00:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 11 Sep 2014 00:51:32 +0000 (00:51 +0000)
* commit 'e1f07060b8c94cc02309172fb9fb8cd4bd0e35f7':
  Do not restore the media button event receiver


Trivial merge