tree d08a14c473bb33652c5ac4d9b05b82476c45f711
parent bfda435744fc110ba2c6ac070a09394a8608a422
parent 7c92e2dccb4e5cb5314455692ac32d2ccff24292
author Irfan Sheriff <isheriff@google.com> 1323234584 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323234584 -0800

am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1

* commit '7c92e2dccb4e5cb5314455692ac32d2ccff24292':
  Disable poor network connection alone