Dianne Hackborn d6b6709b21 Merge "Fix issue #25817435: Batterystats missing UIDs for secondary users" into nyc-dev ...

am: 966f1c9

* commit '966f1c93487b8bc9e259de11e1aaf0fb35b11dc2':
  Fix issue #25817435: Batterystats missing UIDs for secondary users

2016-03-25 01:57:17 +00:00

..

java/com/android/server

Merge "Fix issue #25817435: Batterystats missing UIDs for secondary users" into nyc-dev

2016-03-25 01:57:17 +00:00

jni

Merge "A few changes to the measurement implementation" into nyc-dev

2016-03-22 23:18:15 +00:00

Android.mk

Use native netd binder interface in NetworkManagementService.

2016-03-17 17:47:23 +09:00