commit | 52607c5364446df6ac5b2f55cb50e146e6023a4f | [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 | 47fa98e5e289300bbb65f48af427b4d6d68fa54b | |
parent | 074133b260f8d12e484e93b9aa5a33a4983b7349 [diff] | |
parent | d12dc28460f622ab29e83fa688ad83a8263e9417 [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