commit | b96d3c5195b148c0d695a326fa9c315561d787ef | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Tue Nov 29 14:12:20 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 29 14:12:20 2011 -0800 |
tree | a3af410cc5f0990f5caf0bf01fc77702acdfc247 | |
parent | 6bf045c85526312b198733ac8113cc213c8d79c9 [diff] | |
parent | 5274010d068b05333e3e5544d59ca284802b1a8e [diff] |
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