tree f57e8e0a32baaf95320ec2bb9b457bfb429b6ce4
parent d497796a8bcf44b4812e519e807bc7a050eb4013
parent 4c5302e11ade1747af4eed02dc689394dd2ada8d
author Alex Deymo <deymo@google.com> 1461695512 +0000
committer android-build-merger <android-build-merger@google.com> 1461695512 +0000

Merge "Add scsi/ufs kernel headers." into nyc-mr1-dev am: 7a162b4
am: 4c5302e

* commit '4c5302e11ade1747af4eed02dc689394dd2ada8d':
  Add scsi/ufs kernel headers.

Change-Id: I33ee2606b0df4d8f85e687ce2429d3845f888e6a