RoboErik c4a4636cc2 am fcfe6f5c: am bd94aff2: Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev automerge: b1d52e1 ...

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

2014-11-07 03:55:49 +00:00

..

java/android

am fcfe6f5c: am bd94aff2: Merge changes If4c38bfe,Id9878186 into lmp-mr1-dev automerge: b1d52e1

2014-11-07 03:55:49 +00:00

jni

am 0d8d6ba8: am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev

2014-11-06 02:54:57 +00:00

lib

…

mca

resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp

2014-10-02 14:32:37 +01:00

tests

am 694fd58d: am fed9888e: Merge "Remove outdated tests for custom decoder." into lmp-mr1-dev

2014-10-22 22:39:30 +00:00