commit | e872046f289b1b674b17b68b21fb797a981bac65 | [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 | 0dcd17c48bccf60fb451597d6a0fb72fd0ac705e | |
parent | ed6671ae3ac856ed40a0ecb457b1818e9e28858e [diff] | |
parent | f40dde90b85f24a6ace78bd41a7fecd3adb11ada [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