tree fadc0f04581f69383efa6abdc67d4761987cd6a0
parent 9752d4ef4c5ab02af8b04523057e033bb180d4e9
parent c1f881069de19dfa52aaa4cb06e8b3912c2ad61a
author JP Abgrall <jpa@google.com> 1336775433 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336775433 -0700

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

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