am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1

* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
  Disable wimax when mobile data is in Settings
This commit is contained in:
Robert Greenwalt 2012-01-12 09:26:48 -08:00 committed by Android Git Automerger
commit 6215e2f133

Diff Content Not Available