commit 312e3f06b5c16fa99d37cc8feb418b68b6a0b33b
author vandwalle <vandwalle@google.com> Fri Oct 03 23:57:43 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 03 23:57:43 2014 +0000
tree d1e395350e74a9c7deec519e2a0c528b44a79e1e
parent 7edf1fd8a58668949703f7ff9777f8add51ad08d
parent e0ba94ba9abde13173ae0de8c8939aa4eb9a9085

am e0ba94ba: - slightly better network log - add debug option to enable/disable associated full band scans - networkHistory.txt and wpa_supplicant.conf file get out of sync regarding config.status variable Bug:17648443

* commit 'e0ba94ba9abde13173ae0de8c8939aa4eb9a9085':
  - slightly better network log - add debug option to enable/disable associated full band scans - networkHistory.txt and wpa_supplicant.conf file get out of sync regarding config.status variable Bug:17648443