tree faa5ebe78da5c27c2defca94ca7c57d10982f9eb
parent f10cc08a130184356aa34dbf5f5a48848fc35823
parent 5e4bcea1ebd98f7fb3141784a931b7b26bd511b1
author Rebecca Silberstein <silberst@google.com> 1470090146 +0000
committer android-build-merger <android-build-merger@google.com> 1470090146 +0000

[DO NOT MERGE] WifiStateMachine: better handle disconnect am: 225b5d3d3d am: e99577c248
am: 5e4bcea1eb  -s ours

Change-Id: I75cf75612fb58b73d96e8442b3a3861913c4d79a