tree 47fa98e5e289300bbb65f48af427b4d6d68fa54b
parent 351143fb0e2fcfb7dc2ef1045d693c71eb0ea329
parent d03e7d62d5a5eda07e19b0bbc1eaa6ed82d860c5
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