am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread

* commit '81e1ed7eb5e02edf714cd5f416d1f6ebeaeebae0':
  DO NOT MERGE Support WiMAX Settings & ticker message