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
This commit is contained in:
commit
e872046f28