tree d6273a0ddb2a996bdd80115cb486d78f40fb27e5
parent 31cbd168fcdd577ca4cdd0e725c3d3b21e438e40
parent a2f518378a8e06eacd0fd0f71169a4b6a46ef068
author JP Abgrall <jpa@google.com> 1399491882 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399491882 +0000

am a2f51837: am 66e952e2: Merge "fastboot: support for overriding format fs-type and size"

* commit 'a2f518378a8e06eacd0fd0f71169a4b6a46ef068':
  fastboot: support for overriding format fs-type and size