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

* commit 'f17deff97b290382b9e111e35fc2189ac8ffb75c':
  Reveal some network constants.
tree: 30f724644eccc280e827a39b09bf901ef0060d51
  1. core/
  2. services/