OSDN Git Service

Merge "Add stats logging to ServiceManager and NPMS" into pi-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 12 Apr 2018 01:13:07 +0000 (01:13 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 12 Apr 2018 01:13:07 +0000 (01:13 +0000)
commita26e7559003b4f83553bf1d6c3b0d9558ec20005
tree9754b9467d91baa67808f14a0c662e27ccc53a10
parent1be03922739b377f53571d5c5b05d224241347b8
parent49392d335af8559169238bb9cb4fc2911192adea
Merge "Add stats logging to ServiceManager and NPMS" into pi-dev
services/core/java/com/android/server/am/ActivityManagerService.java
services/core/java/com/android/server/net/NetworkPolicyManagerService.java