tree 9151193c05155e36d4fd677feed3cf4a62fb6528
parent 37dcda68d334f70e1f7f69a9817def65fe3ee717
parent 1206e872ce74aab253c39c3547bfaadc5e1f6011
author Jean-Baptiste Queru <jbq@google.com> 1290191151 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1290191151 -0800

am 1206e872: resolved conflicts for merge of 09f774b7 to gingerbread-plus-aosp

* commit '1206e872ce74aab253c39c3547bfaadc5e1f6011':
  vold: fix an offset one bug that makes partition 4 unusable
  vold: set state back to idle on formatting error