Marco Nelissen d99e62c5a0 am 7f8040a8: am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev ...

* commit '7f8040a80472b86c358f4b28ca7ec938d7fbed00':
  Use stream type if set by user

2014-11-19 00:14:09 +00:00

..

java/com/android/server

am 7f8040a8: am 0acbed25: am 6104fb28: Merge "Use stream type if set by user" into lmp-mr1-dev

2014-11-19 00:14:09 +00:00

jni

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

2014-11-12 13:24:42 -08:00

Android.mk

…