tree 0dcd17c48bccf60fb451597d6a0fb72fd0ac705e
parent 63f0959613dba977f66fbf604b93486a0764567c
parent 8c65dea758a90c3b79317f96ecacf22d523576f2
author Andreas Huber <andih@google.com> 1322604543 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322604543 -0800

Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1