Svetoslav Ganov 6dd856b1ea Merge "Don't drop runtime permissions on older system app update." into mnc-dev

2015-09-03 17:08:57 +00:00

..

java/com/android/server

Merge "Don't drop runtime permissions on older system app update." into mnc-dev

2015-09-03 17:08:57 +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