Xin Li cc115c5931 Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev

2016-11-08 21:25:43 +00:00

..

java/com/android/server

Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev

2016-11-08 21:25:43 +00:00

jni

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

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

Android.mk

…