| commit | a81f9fd3118b2f93d2a36788f49e4c7be6e64e41 | [log] [tgz] |
|---|---|---|
| author | Michael Ryleev <gmar@google.com> | Tue May 03 20:12:16 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 03 20:12:16 2016 +0000 |
| tree | 36734615d28a54223f4b4025b2ddb14019b94108 | |
| parent | 23ebf6dcd9409c03e75c6e56998ff01e94113768 [diff] | |
| parent | cf401627fd76c145e1d1dc12f04975d29385a9f8 [diff] |
Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10 am: 09167c2f5c am: 97d33dc5b0 -s ours * commit '97d33dc5b03c8e2ebfbbf1f3a17c3935a92e696f': 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: Idd4cfa612382bf76ca9ed775f36de621197ec54c