tree 8ff559e845d18c1498258f2fa13fe85e9b0e8cbd
parent 63de615ddb3cb81bbb5b548693faca971d182a6d
parent f13eb8301f4704179938e374129f2943c9c38d5f
author Robert Greenwalt <rgreenwalt@google.com> 1304528536 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1304528536 -0700

am f13eb830: Merge "Add auto-restore timeout for secondary networks." into honeycomb-LTE

* commit 'f13eb8301f4704179938e374129f2943c9c38d5f':
  Add auto-restore timeout for secondary networks.