tree 986455ff097f4e9bdcf0501b350f1673887b017e
parent f2eacb2d3345fbe7fd58b218c8405188395faaf1
parent a1b34a43a258db964adf487b266b68a3079c71a2
author Annie Meng <anniemeng@google.com> 1527108385 -0700
committer android-build-merger <android-build-merger@google.com> 1527108385 -0700

Merge "Fix NPE in restoring network policies" into pi-dev
am: a1b34a43a2

Change-Id: I6d194662825bb794acd6c799444d35275d567da8