tree db6fdd657d22ae7ec3963869c0e436aa35b8deb9
parent 2de0b07f47c3561b6e550ff630901d2776a437e3
parent d426c338a66f63f8e5528ac38ec5b61625f2c897
author Jaikumar Ganesh <jaikumar@google.com> 1323316331 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1323316331 -0800

am d426c338: Merge "Reduce likelihood of crash in state machine." into ics-mr1

* commit 'd426c338a66f63f8e5528ac38ec5b61625f2c897':
  Reduce likelihood of crash in state machine.