OSDN Git Service

Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev
authorRoboErik <epastern@google.com>
Thu, 6 Nov 2014 21:42:55 +0000 (21:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Nov 2014 21:42:55 +0000 (21:42 +0000)
automerge: b1d52e1

* commit 'b1d52e1d2095d0df986d4c338af43c5cd2b6efc5':
  Update metadata artwork and uri docs
  skip MediaController callbacks if it's been unregistered


Trivial merge