Christopher Tate 467a86bce5 am 91beb94c: resolved conflicts for merge of a5bb65aa to master
* commit '91beb94c65716f78a120cff93e3bb78a190500b4':
  Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value
2014-01-22 19:06:07 -08:00
..
2014-01-15 10:12:52 -08:00