OSDN Git Service

am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers...
authorAndreas Huber <andih@google.com>
Tue, 29 Nov 2011 22:12:20 +0000 (14:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Nov 2011 22:12:20 +0000 (14:12 -0800)
commitb96d3c5195b148c0d695a326fa9c315561d787ef
treea3af410cc5f0990f5caf0bf01fc77702acdfc247
parent6bf045c85526312b198733ac8113cc213c8d79c9
parent5274010d068b05333e3e5544d59ca284802b1a8e
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