am 5df69fad: resolved conflicts for merge of 8de47a2f to honeycomb-LTE

* commit '5df69fad6e5021d2862bff0553a510f8d6729fbd':
  Reveal some network constants.