Dianne Hackborn 81f3a85aa2 Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

2015-08-14 17:06:20 +00:00

..

java/com/android/server

Merge "Fix issue #22940169: "pm grant" can no longer grant permissions..." into mnc-dev

2015-08-14 17:06:20 +00:00

jni

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

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

Android.mk

…