tree 1c4f511718f450d658a1ee916668e765663f4b2c
parent 44629a33690011863d97ca679de77aad3d2642e2
parent 91bfadb4aa75444c60e9949232de3c184cfe060a
author Andreas Huber <andih@google.com> 1337619998 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337619998 -0700

am 91bfadb4: If we encounter an error during buffer allocation change state back

* commit '91bfadb4aa75444c60e9949232de3c184cfe060a':
  If we encounter an error during buffer allocation change state back