tree 338df8136dbca6d0307d3a3e757817c0a017c92e
parent e16dc7932bbbd4b9aa7dd56b5ce5f1c991e17265
parent fe8af96eba9df879f5bce4cea6b03037b00a5137
author Mark Chien <markchien@google.com> 1560321817 -0700
committer android-build-merger <android-build-merger@google.com> 1560321817 -0700

Merge "Fix NullPointerException in ConnectivityService" am: fe8af96eba
am: d0e6636019

Change-Id: If0c65bd11f5b76e35f6033fa79a8938f7e47a8e7