tree cb3bc895093ac76608b863466d0abf617a9f64bc
parent 5e1383f25782e553294bca387f3c072073416416
parent 568845a766cddc4e4c222b4d9de064f8a48da990
author Robert Greenwalt <rgreenwalt@google.com> 1301502615 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1301502615 -0700

am 568845a7: Merge "Fix some alt-network issues." into gingerbread

* commit '568845a766cddc4e4c222b4d9de064f8a48da990':
  Fix some alt-network issues.