tree 2677f944abbab44278fab5b0242226f0fbc9bb79
parent 0ac3183c6489120fa84df9e289b2db31fb49c842
parent d7a8e8453d8302ac9820af49b4b112468efdf36d
author Simon Wilson <simonwilson@google.com> 1301964278 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301964278 -0700

am d7a8e845: (-s ours) am ec944728: Merge "DO NOT MERGE Disable WiMAX when "Data Enabled" is off" into gingerbread

* commit 'd7a8e8453d8302ac9820af49b4b112468efdf36d':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off