tree 8177c6053079fd2e32b59112ba3a1128d1db82b6
parent 6565e61226a3cefe59c4cb417490c8b6c2309ab0
parent 81b857f3a21f3ae96a5ec72e54982fe30278049f
author Daniel Rosenberg <drosen@google.com> 1410903285 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410903285 +0000

am 81b857f3: Merge "fastboot: Remove tos from flashall" into lmp-dev

* commit '81b857f3a21f3ae96a5ec72e54982fe30278049f':
  fastboot: Remove tos from flashall