commit | 321e4c9c8fa32b814d59e81fec2c7f07b4861928 | [log] [tgz] |
---|---|---|
author | Simon Wilson <simonwilson@google.com> | Mon Mar 14 18:24:48 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 18:24:48 2011 -0700 |
tree | ff0576083d577fd7b113d65970fa23a2d0110658 | |
parent | 8fccbcfb8ea2e13727367b46ea4bb562f69d0bca [diff] | |
parent | 81e1ed7eb5e02edf714cd5f416d1f6ebeaeebae0 [diff] |
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