tree 88b12a0c64fc835ade01d012a827c26e36c4b42b
parent 007d5b2cf6af32dfe96c0c04988d090b872afb01
parent d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486
author Kenny Root <kroot@google.com> 1285971082 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285971082 -0700

am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread

Merge commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp

* commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486':
  Add "none" for vold and deprecate mkobb -c