commit | 81a2768553b3f4b2e40c7fda9ff501ca7fe533df | [log] [tgz] |
---|---|---|
author | Simon Wilson <simonwilson@google.com> | Mon Mar 14 18:27:28 2011 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 14 18:27:28 2011 -0700 |
tree | 96ad61bb8195c565aca28af546b33c8499bec00a | |
parent | e2bd5523a5e8d3091705ae8e688a32ca0dfe63da [diff] | |
parent | 69d328abcd787a1c5ac84b54a2aaea927a9826c7 [diff] |
am 321e4c9c: (-s ours) am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread * commit '321e4c9c8fa32b814d59e81fec2c7f07b4861928': DO NOT MERGE Support WiMAX Settings & ticker message