am 0070ee42: am 5381e4ef: Merge "Refine fix I53e91db7 to apply only to wifi network" into eclair

Merge commit '0070ee42201c3d1c005828234ece3e25e620dcc9'

* commit '0070ee42201c3d1c005828234ece3e25e620dcc9':
  Refine fix I53e91db7 to apply only to wifi network
tree: fbaddcf3442b4a13585dcf5d5b022ccc9e37cd62
  1. core/
  2. services/