am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread

* commit '03aa986e6b19e436c71801d2e5af6f44521a94ab':
  DO NOT MERGE Change WiMAX indicator display