tree 12d1c6c7e138ec37cd12176e1cc3de54f8c5aca9
parent 88fda250b5284551c2176b660d0b1b7eec23ad2c
parent e95a90e5995d1121080b5da09d75d53093af8818
author JP Abgrall <jpa@google.com> 1399405237 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399405237 +0000

am e95a90e5: am 1762dbfb: am 2d2fd4cd: Merge changes Ibff1f74e,Ic82595cf,If4e01cab

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