Jinsuk Kim f657463a50 am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev ...

* commit 'c69c8dc15972179728932f91dde483e9d61f34a9':
  Do not perform forceVolumeControlStream in master volume mode

2014-11-26 21:39:08 +00:00

..

java/android

Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev

2014-11-26 21:27:19 +00:00

jni

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

2014-11-25 19:04:05 +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