OSDN Git Service

Merge "standardize network policy notification IDs" into oc-dev
authorChris Wren <cwren@android.com>
Mon, 3 Apr 2017 13:42:38 +0000 (13:42 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 3 Apr 2017 13:42:44 +0000 (13:42 +0000)
commitef3a28cb92039c198ed8e78a69d00bd9c8322dab
tree50a61f018ba7de8f1a855ee17f4eab4307dd1f56
parentde8cd0e8f58aeb87c80f076db27ba4755fbc4856
parent193ae6bc785170516a8c67174ddab2cc254c57a2
Merge "standardize network policy notification IDs" into oc-dev
proto/src/system_messages.proto
services/core/java/com/android/server/net/NetworkPolicyManagerService.java