tree 30f724644eccc280e827a39b09bf901ef0060d51
parent e0f7bc0b841c0b6a09fb7d5b259a6772b3a53df3
parent f17deff97b290382b9e111e35fc2189ac8ffb75c
author Robert Greenwalt <rgreenwalt@google.com> 1307477549 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307477549 -0700

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

* commit 'f17deff97b290382b9e111e35fc2189ac8ffb75c':
  Reveal some network constants.