tree 97c139d55b580f53c54dd079594bc6bc16c8a7b9
parent c5b5366f1ba236a98cb5aa044b89c6302baf4540
parent 800f3ca4ddf52fe46d039505266c84b0ad0234b1
author Jean-Michel Trivi <jmtrivi@google.com> 1409854231 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409854231 +0000

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