Jean-Michel Trivi 583c6940d5 am 40a47f6d: am 4b495477: am 9f1bca5f: am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev ...

* commit '40a47f6dd7413e19c34869be17b029051c3b8d25':
  Send volume keys to the default stream if not actually playing

2014-10-01 02:14:42 +00:00

..

java/com/android/server

am 40a47f6d: am 4b495477: am 9f1bca5f: am 0ed179d1: am 4a154af9: Merge "Send volume keys to the default stream if not actually playing" into lmp-dev

2014-10-01 02:14:42 +00:00

jni

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

2014-09-29 15:10:23 -07:00

Android.mk

…