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

* commit '21eba066e5c50e20f9beb036336fa832c7a92509':
  Disable wimax when mobile data is in Settings
tree: 114b5ec3672111b514c238cf8e53ceef6cd0d05b
  1. core/
  2. services/