| commit | 97d33dc5b03c8e2ebfbbf1f3a17c3935a92e696f | [log] [tgz] |
|---|---|---|
| author | Michael Ryleev <gmar@google.com> | Tue May 03 20:05:00 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 03 20:05:00 2016 +0000 |
| tree | 1674e4c83d8029fc0930765616356fd9ac647732 | |
| parent | 75701b0d60e6b47f3fd78af39c590e313a15a666 [diff] | |
| parent | 09167c2f5cfbc75441d34372a1f0cb1b82c32aa2 [diff] |
Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10 am: 09167c2f5c * commit '09167c2f5cfbc75441d34372a1f0cb1b82c32aa2': trusty: storage: implement storage proxy daemon trusty: storage: add trusty interface header trusty: add trusty-base.mk trusty: add keymaster module trusty: add gatekeeper module Change-Id: Ib6576b95a4badf0885a8b922722ec5d9146843a1