tree c662c19189a2125f99d255ffde543d2fec08e618
parent 27e3913b7c95aa15061368f50aada7b6b7c71eb2
parent 2d2fd4cdeac031e78a63c40d01a96a93ebb3eed8
author JP Abgrall <jpa@google.com> 1399404934 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399404934 +0000

am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab

* commit '2d2fd4cdeac031e78a63c40d01a96a93ebb3eed8':
  fastboot: Added tos as an optional image
  fastboot: Fixed optional entries
  fastboot: allow format on devices with small buffers