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 errorgugelfrei
commit
2996451f77
Loading…
Reference in new issue