am 6a3b7db2: am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev
am 6a3b7db2: am 771c11b7: Merge "Fix duplicate SSID entries in the WifiSettings UI" into klp-dev

* commit '6a3b7db257db3e8c6be834fe69859bf2465af380':
  Fix duplicate SSID entries in the WifiSettings UI

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base