Fyodor Kupolov cb3ae68e14 am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev ...

* commit '67a32c499177d41e48c3ac5a803f883fd97acf37':
  Added missing check for MANAGE_USERS

2015-07-28 00:35:31 +00:00

..

java/com/android/server

am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev

2015-07-28 00:35:31 +00:00

jni

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

2015-07-25 01:29:26 +00:00

Android.mk

resolved conflicts for merge of 962a11ad to master

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