OSDN Git Service

Merge changes from topic "planz" into pi-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Mon, 2 Apr 2018 21:56:59 +0000 (21:56 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 2 Apr 2018 21:56:59 +0000 (21:56 +0000)
commit93e11759d69e0d79ab1d2e57b072b075fc8cd614
treef8f5d9dee5b1bdc38b4efe4549b9ce6f4ffb734f
parent084f9aee9a54a86680feed7cafd56a06ba6f24f8
parent003d3e61e6f6ed47e1d6301af302ce69557ba5fa
Merge changes from topic "planz" into pi-dev

* changes:
  Tests for SubscriptionManager APIs.
  Obtain NPMS through helper method.
services/core/java/com/android/server/net/NetworkPolicyManagerService.java