am cf4f2c22: Merge change Ic6d1545d into eclair-mr2

Merge commit 'cf4f2c22cbe62843324718f657021ce0c459a3db' into eclair-mr2-plus-aosp

* commit 'cf4f2c22cbe62843324718f657021ce0c459a3db':
  Support double-quote SSID in WifiService.