Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb9b2994 authored by Michael Ryleev's avatar Michael Ryleev Committed by android-build-merger
Browse files

Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10 am: 09167c2f 

am: 97d33dc5  -s ours

* commit '97d33dc5':
  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
parents af736bb5 97d33dc5
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment