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

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

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