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

* commit 'd4f4fb98ed4c3d0e36a0a873390914007863135a':
  DO NOT MERGE Change WiMAX indicator display