tree 122b193f615bae686d71cc0bf7f53b85bb5b4362
parent 345219f068146332bec7d44510ecb2932163a4dc
parent bda5769701a30f6922f423b52b38066544b08d8e
author Robert Greenwalt <rgreenwalt@google.com> 1470864571 +0000
committer android-build-merger <android-build-merger@google.com> 1470864571 +0000

Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." am: 2438a33e54
am: bda5769701

Change-Id: I921e50e48b0c93e31fa3d172c850629312f322e6