tree 14b715de9587f5ba917dc29747f0adc225715e82
parent ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae
parent 5c6248c9321990f0fbe8ac7c061f0e61ba0725f1
author Jean-Michel Trivi <jmtrivi@google.com> 1409851321 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409851321 +0000

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 '5c6248c9321990f0fbe8ac7c061f0e61ba0725f1':
  Do not restore the media button event receiver