tree 2890404c983d9b9cce91dcbed7a1f561708ecc24
parent 825e28c6c5c312c08f44b71400f987b6bd66e103
parent de1b950d2b07737e3d284ed2ada361737d8a5a1a
author Wink Saville <wink@google.com> 1302211880 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1302211880 -0700

am de1b950d: am 9e7a5a1e: Merge "ConnectivityService needs to use the new names for the NetConfig vars." into honeycomb-LTE

* commit 'de1b950d2b07737e3d284ed2ada361737d8a5a1a':
  ConnectivityService needs to use the new names for the NetConfig vars.