tree 5fa99bc35d0713f64ff73e1cdab5375ac2131e73
parent 217b0a8468083c6b9225d6df3f1e0065960c75d5
parent 00e37916bc121cea928f6bad6d059cbd00e8bf6b
author Jim Miller <jaggies@google.com> 1295978918 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295978918 -0800

am 00e37916: am 1323ab83: am 42a46157: Fix 3379239: Catch exceptions from workaround for OOM.

* commit '00e37916bc121cea928f6bad6d059cbd00e8bf6b':
  Fix 3379239: Catch exceptions from workaround for OOM.