tree f2ba1c8d87583255634e331cef6a096ebc09803f
parent 7ac2d2d30a0c9ed2087408d84195c4f985b7e712
parent b664a0148c4c8a1721463d2519bc6f5555c7bc91
author Rebecca Silberstein <silberst@google.com> 1493241893 +0000
committer android-build-merger <android-build-merger@google.com> 1493241893 +0000

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

Change-Id: Ie49dbd2542bde07b8f71d9ea1f0ba088d523f6fe