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

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

2014-11-26 21:45:22 +00:00

..

java/android

am f657463a: am c69c8dc1: am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev

2014-11-26 21:45:22 +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