am 6f620395: (-s ours) am f76a05e9: Merge "DO NOT MERGE Fix wifi status icon" into gingerbread

Merge commit '6f6203950d782c53193b5e96be7fb9fa4fab339c'

* commit '6f6203950d782c53193b5e96be7fb9fa4fab339c':
  DO NOT MERGE Fix wifi status icon