tree 990ce14230e7fdafbf92ed78f8c858a9118799ae
parent 27b18cc63229dc86ab25f3a17ee894c7dacbff8e
parent 6f69ea87e76b034bff7eb7a795386020ce76af85
author Rebecca Silberstein <silberst@google.com> 1493240789 +0000
committer android-build-merger <android-build-merger@google.com> 1493240789 +0000

Merge "WifiManager: add updateInterfaceIpState" am: 2dbd137795
am: 6f69ea87e7

Change-Id: I55d0e265488a67d0c379f19e47fbadff5ba51671