commit 5c3e062056747e2e40bdb55b831395ce18bbd68c
author vandwalle <vandwalle@google.com> Mon Sep 08 19:32:44 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 08 19:32:44 2014 +0000
tree d813cef67ab3ff657aa53ff3d76b5bfbdb1c2ebe
parent a8ea00af2af1b91a4043daf390b04d5c15b72e80
parent 171575266c57e1f7b5d6956e129b3cfa0a01dcdd

am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be looked at with each Network

* commit 'a35a795fab56f3d0239a67191f97aa1756fecd3b':
  add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don't loose connection, hence it must be looked at with each Network State Change