tree 643dc8a70973bdbea6a3a2481cae81e88310b8e2
parent 69a5b7777f67f6d5ad9dbd33758332c7b0104613
parent 6e4d5db1b11f808bb4bdcc8dd45a7158c6c88515
author Robert Greenwalt <rgreenwalt@google.com> 1312416880 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312416880 -0700

am 6e4d5db1: Fix two error-case unwinders.

* commit '6e4d5db1b11f808bb4bdcc8dd45a7158c6c88515':
  Fix two error-case unwinders.