Jeff Brown 1631f3744f Merge "Pause activities when the screen is off." into mnc-dev

2015-06-10 23:45:13 +00:00

..

java/com/android/server

Merge "Pause activities when the screen is off." into mnc-dev

2015-06-10 23:45:13 +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