tree 85480a6878ff45ef27df5c3611f5d50af6a68dcd
parent 1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5
parent 1310a1cdba8a0f5e1c8741a5fbcf81eb76c6c2b2
author Jean-Michel Trivi <jmtrivi@google.com> 1409850882 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409850882 +0000

am 1310a1cd: (-s ours) am ec50dfc0: am 20fc473c: am f0336eb8: am 2cb287f9: am 9ea996a3: Do not restore the media button event receiver

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