OSDN Git Service

Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
authorHugo Benichi <hugobenichi@google.com>
Fri, 7 Apr 2017 03:54:47 +0000 (03:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Apr 2017 03:54:47 +0000 (03:54 +0000)
commitcf247ffa8755028bc768ec3585eb2b7785eceaf9
tree52db462f5ddae70aba040f7f0a5caa8d2590f274
parentd45000c1a9ea75421f5d56145097bbd25ef7d8ef
parent8ce439a76861e9e90b5b8ef7fa757bf798ac76fa
Merge "NetworkPolicyManagerService: turn off rule debugging" into oc-dev
am: 8ce439a768

Change-Id: Ic5984629c83f4af4175a40b6cb70ad5741ca4e25