tree 1c9e396809324b2dc90a6288bb02dfdf2ea82adf
parent 909cdff437ad91ebb0d498389d1a352fca5c8883
parent 525e552eef3e38f3ab1a61377ebe69af43e959d7
author Jean-Michel Trivi <jmtrivi@google.com> 1409854644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409854644 +0000

am 525e552e: am 800f3ca4: am 14c8acef: am 5fb35780: am daf113b1: am 5c6248c9: am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver

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