commit | 9a90b82f0bd0f1abac96e472a0c25ca6eab1b3a8 | [log] [tgz] |
---|---|---|
author | Andreas Huber <andih@google.com> | Tue Nov 29 16:33:04 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 29 16:33:04 2011 -0800 |
tree | 12628ec22bf1f54d78253b347e3e94b3ad8f0d20 | |
parent | ef40a5b77edeb95de00d42425cd40f36e09dfb41 [diff] | |
parent | e872046f289b1b674b17b68b21fb797a981bac65 [diff] |
am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 * commit '52607c5364446df6ac5b2f55cb50e146e6023a4f': If an error occurs that prevents us from reallocating buffers during a format change