tree 24dfafc46cd1d00d91a69274953a24ef190483b8
parent 5efad86b916cb506b57bacfe48d7ddb8639507fb
parent 938ab4fa3942398e942d98aa7b16dd87dfb7ff11
author Hugo Benichi <hugobenichi@google.com> 1491267020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1491267024 +0000

Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev