tree cafc00670911caca00d26f0f2048a2ee8b5afa09
parent 267a688f18cd70191ffce4a6306c6e315bd116d3
parent ab42c6e9bd52fd56996a0f1a16bb1dcb176036d0
author Simon Wilson <simonwilson@google.com> 1300152288 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300152288 -0700

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