tree 86474ce61ba78ecf50005d550a36b3d1b40f60ff
parent b8ad0f09d158d872693ed6208476fdb15fc515f9
parent 177a74aced971b89c319fb61ee12da0ca40f0c12
author JP Abgrall <jpa@google.com> 1337009713 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337009713 -0700

am 177a74ac: am c1f88106: Merge "fastboot: Change -w to format after the erase of userdata & cache" into jb-dev

* commit '177a74aced971b89c319fb61ee12da0ca40f0c12':
  fastboot: Change -w to format after the erase of userdata & cache