tree 94b66501b8acebf2384bc86df5d376da1e9876c2
parent 8bd6de5fb9c8bb6ed544caad3fa81ff33acedfe4
parent c6f10b906fc9c120cafc81046a42b2434ff635a9
author Winson Chung <winsonc@google.com> 1321314971 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1321314971 -0800

am c6f10b90: Workarounds for a couple crashes. (Bug 5612584, Bug 5613438)

* commit 'c6f10b906fc9c120cafc81046a42b2434ff635a9':
  Workarounds for a couple crashes. (Bug 5612584, Bug 5613438)