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

* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
  Disable wimax when mobile data is in Settings
tree: f639f216a25735e11029ec1c19c2fbf55bb3859b
  1. core/
  2. services/