am f76a05e9: Merge "DO NOT MERGE Fix wifi status icon" into gingerbread

Merge commit 'f76a05e985c249f2540eb8925f673b5c63b9566b' into gingerbread-plus-aosp

* commit 'f76a05e985c249f2540eb8925f673b5c63b9566b':
  DO NOT MERGE Fix wifi status icon