tree 2f8c8b0521a2a08edde150c72c9a0eca987b5602
parent 7e3db07cc3090008345b234ed8db5eb98e93cad4
parent b834f540332433066fa3c083ce00465e293dc996
author Dianne Hackborn <hackbod@google.com> 1321537592 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321537592 -0800

am 65952ec4: am 4c6a65bc: Merge "Maybe fix issue #5627399: java.lang.RuntimeException - While sign in..." into ics-mr1

* commit '65952ec4dc0e1703eb87a54c252953c53d07affc':
  Maybe fix issue #5627399: java.lang.RuntimeException - While sign in...