Christopher Tate 6afdad7e88 Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev

2015-07-20 17:05:32 +00:00

..

java/com/android/server

Merge "Don't fall back to domain verification state when looking up app linkage state" into mnc-dev

2015-07-20 17:05:32 +00:00

jni

BatteryStats: Record suspend abort reasons

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

Android.mk

resolved conflicts for merge of 962a11ad to master

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