tree 94228506f8dac5d205574cf57f82a313b1ba584a
parent 6c7bc3711f9e4b2b5a7cd88de26d063e3fff9b7f
parent 4fa904aba2d60ca8bce39b30264076d8eec7a904
author Jean-Michel Trivi <jmtrivi@google.com> 1410410016 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410410016 +0000

am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver

* commit '4fa904aba2d60ca8bce39b30264076d8eec7a904':
  Do not restore the media button event receiver