Erik Kline 3d54e672a5 Merge "Carefully select which DNS servers to send to netd" into mnc-dev

2015-06-18 06:25:09 +00:00

..

java/com/android/server

Merge "Carefully select which DNS servers to send to netd" into mnc-dev

2015-06-18 06:25:09 +00:00

jni

UsbMidiDevice: Only keep ALSA devices open when device is in use

2015-06-08 16:48:19 -07:00

Android.mk

resolved conflicts for merge of 962a11ad to master

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