tree 12199731a4dcaa2cca2bbdd71c1d2b7e10f990f9
parent b50d9bb630e3f0d71bfb9fe0d3bd98af95368cbc
parent a3d9eba10461158a52acfc2a0324696b25db761f
author Irfan Sheriff <isheriff@google.com> 1320361804 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320361804 +0000

am a3d9eba1: Merge "Reset IP failure counter on a success" into ics-mr1

* commit 'a3d9eba10461158a52acfc2a0324696b25db761f':
  Reset IP failure counter on a success