am f018bd8c: (-s ours) am 36469186: DO NOT MERGE WiMAX settings menu

* commit 'f018bd8cf3c27cf6ee8dc41c673e9d91b005c8a3':
  DO NOT MERGE WiMAX settings menu