tree 1164052313d4ce86196ea94948d7e6f55384fc44
parent 52a82a4c7d399be6d047132551a3ffaa9cd9e9d2
parent 6d23923aa76ce5004f85425f7d85fc0ce4020f01
author Christopher Ferris <cferris@google.com> 1442692801 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442692801 +0000

am 6d23923a: am d65800a0: Merge "Import scsi headers"

* commit '6d23923aa76ce5004f85425f7d85fc0ce4020f01':
  Import scsi headers