Jean-Michel Trivi f764d219f0 Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev

2015-04-30 16:43:19 +00:00

..

java/com/android/server

Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev

2015-04-30 16:43:19 +00:00

jni

UsbDevice: Add support for retrieving version string for a USB device

2015-04-29 13:05:55 -07:00

Android.mk

resolved conflicts for merge of 962a11ad to master

2015-03-31 11:15:39 +01:00