Jeff Tinker 0d8d6ba807 am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev ...

* commit 'e7f66ada24c2b4098e9fea1c07d570543149c806':
  Add missing secure stop methods

2014-11-06 02:49:08 +00:00

..

java/android

Merge "Add missing secure stop methods" into lmp-mr1-dev

2014-11-06 02:33:23 +00:00

jni

Merge "Add missing secure stop methods" into lmp-mr1-dev

2014-11-06 02:33:23 +00:00

lib

Fix name error in com.android.mediadrm.signer.xml

2014-05-30 08:27:33 -07:00

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