| commit | 0edbaa6a223e930890363e3252372cbd078c580b | [log] [tgz] |
|---|---|---|
| author | Michael Ryleev <gmar@google.com> | Tue May 03 20:19:46 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 03 20:19:46 2016 +0000 |
| tree | ac08d735a9980929e6037898c2581b9d2ceeb677 | |
| parent | 8d04b5a0926c2fa8547550afce7c20daa3a389fb [diff] | |
| parent | a81f9fd3118b2f93d2a36788f49e4c7be6e64e41 [diff] |
Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10 am: 09167c2f5c am: 97d33dc5b0 -s ours am: cb9b299418 * commit 'cb9b2994185886c9ed8ceeea48e172e062665556': 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: I6002fded601b4256c60729a6cb6f67acdaf943c7