tree 8233b79ef0a18576041801bc14dd8d4bcd4e5dc2
parent 4df075bcb5770ba411b6a32c9daeac24da0597e2
parent e1f07060b8c94cc02309172fb9fb8cd4bd0e35f7
author Jean-Michel Trivi <jmtrivi@google.com> 1410396692 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410396692 +0000

am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver

* commit 'e1f07060b8c94cc02309172fb9fb8cd4bd0e35f7':
  Do not restore the media button event receiver