OSDN Git Service

am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers...
authorAndreas Huber <andih@google.com>
Tue, 29 Nov 2011 22:30:45 +0000 (14:30 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Nov 2011 22:30:45 +0000 (14:30 -0800)
commitd7dbc9e610281bcdd5a1f0292e066aa2dbf749c4
treeddfbfbf5682c8b20468f7d1ded274d28c150443c
parent4d1ba696c0b308cc5a148e8228b9ef3a9a9e48f4
parent5274010d068b05333e3e5544d59ca284802b1a8e
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