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

* commit '0249717644b0f4f1f3f0316e2de2930a16b019bc':
  DO NOT MERGE Disable WiMAX when "Data Enabled" is off
tree: 18661a585d35c5b18c1a97b679752d7214d35d6a
  1. core/
  2. services/