tree 7bb9213cb026e7749e4c60a8e071c8fc75378a7b
parent f40275d35ec3eaadbd1afd296715215bdd29a09b
parent 7632ed91d91906504212cb7acc85128c89d6d3c7
author Jean-Michel Trivi <jmtrivi@google.com> 1409860148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409860148 +0000

am 7632ed91: 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 '7632ed91d91906504212cb7acc85128c89d6d3c7':
  Do not restore the media button event receiver