tree dff9e43a126593c32fd1996911bfb1e8ec5d44be
parent b2e27cd6b87e4f4abd59f603f61d57079c447ed7
parent 6651cd38307d516f5c8e322828b7aaa076231071
author RoboErik <epastern@google.com> 1415214100 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415214100 +0000

am 6651cd38: am e2b8dab0: am 5604a85a: Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev

* commit '6651cd38307d516f5c8e322828b7aaa076231071':
  Add extras to the PlaybackState
  Add setRatingType to MediaSession