Jean-Michel Trivi 2a1cdd4d4f am 8e74a8a7: am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev ...

* commit '8e74a8a77e06c93180a5b807c3d9865c89be3dc7':
  AudioMix address and type, rule exclusion API, dynamic source

2014-12-02 17:31:25 +00:00

..

java/android

am 8e74a8a7: am 874e4502: am 57457b98: Merge "AudioMix address and type, rule exclusion API, dynamic source" into lmp-mr1-dev

2014-12-02 17:31:25 +00:00

jni

am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"

2014-11-25 19:57:42 +00:00

lib

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

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

mca

Remove unused variables and functions, don't warn about unused parameters

2014-11-23 22:24:32 +01:00

tests

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

2014-11-21 09:57:52 -08:00