Dianne Hackborn c14cbac4a3 Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

2015-08-20 01:56:02 +00:00

..

java/com/android/server

Merge "Fix issue #23361510: Increase assist timeout from 500ms to 1 second" into mnc-dev

2015-08-20 01:56:02 +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