tree 902647c123c00402e44ebf7e07587225641ef20c
parent fba14c7da762727eb929c3e48ac244dbe99fec6c
parent af9486f8c5f6a6e7850b31dff1794c1afecb2fd5
author Michael Ryleev <gmar@google.com> 1464191275 +0000
committer android-build-merger <android-build-merger@google.com> 1464191275 +0000

Merge "trusty: storageproxyd: use upstream kernel headers"
am: ed01d17e1b

* commit 'ed01d17e1bf54edad1989c2da7505e0efb673a9b':
  trusty: storageproxyd: use upstream kernel headers

Change-Id: Ia527c3f104caaced60b0a1597951358861019be1