Jim Miller c7b0435cc7 resolved conflicts for merge of 1d4247c4 to mnc-dr-dev ...

Change-Id: I057c529dcd5d48e0dcf256a9d096c5d8b815892a

2015-07-15 14:33:10 -07:00

..

java/com/android/server

resolved conflicts for merge of 1d4247c4 to mnc-dr-dev

2015-07-15 14:33:10 -07:00

jni

BatteryStats: Record suspend abort reasons

2015-06-25 13:14:27 -07:00

Android.mk

…