tree f1efcb89bb9210d59d325f6087111108c9beb032
parent 763830a0e650a3b9a18fffafdd3af88bd65d7c44
parent ef2b35ad591156d3e18c6b9a5a240ed325dec02a
author pkanwar <pkanwar@google.com> 1484009904 +0000
committer android-build-merger <android-build-merger@google.com> 1484009904 +0000

DO NOT MERGE: Fix NPE in ConfigureWifiSettings.
am: ef2b35ad59  -s ours

Change-Id: I512a3b568246c2693a335c63a22e88d6d4b3edbe