tree a3af410cc5f0990f5caf0bf01fc77702acdfc247
parent 6bf045c85526312b198733ac8113cc213c8d79c9
parent 5274010d068b05333e3e5544d59ca284802b1a8e
author Andreas Huber <andih@google.com> 1322604740 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322604740 -0800

am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1

* commit 'd12dc28460f622ab29e83fa688ad83a8263e9417':
  If an error occurs that prevents us from reallocating buffers during a format change