Matthew Williams 77d5b91401 Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev

2015-08-10 22:36:49 +00:00

..

java/com/android/server

Merge "DO NOT MERGE: Idle Job Start During SCREEN_ON or DREAMING_STOPPED" into mnc-dev

2015-08-10 22:36:49 +00:00

jni

Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev

2015-07-25 01:14:07 +00:00

Android.mk

resolved conflicts for merge of 962a11ad to master

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