| commit | d66e05c6c45698c69e3368090adfbd56c00fc9a8 | [log] [tgz] |
|---|---|---|
| author | Michael Ryleev <gmar@google.com> | Wed May 25 15:50:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 15:50:50 2016 +0000 |
| tree | 13da2ddfcd9aa73daf4b89991ad2054b900bb701 | |
| parent | f7571ca4185fa57d9671776f821502dd6d6fb4ba [diff] | |
| parent | 420d64de7b3406b3493e42bff8a5ac2631ec3314 [diff] |
Merge "trusty: storageproxyd: use upstream kernel headers" am: ed01d17e1b am: 420d64de7b * commit '420d64de7b3406b3493e42bff8a5ac2631ec3314': trusty: storageproxyd: use upstream kernel headers Change-Id: Iecda534cbd181f9e9f4bf4d28917fe2f8c17d565