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

Original change: undetermined

Change-Id: Ide16c9d70e9a58d601d27f7354cc548f8be653de