| commit | e5f8bbe11e16f60077f224ff3679497f3d1a41a1 | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Wed Sep 16 22:18:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:18:29 2015 +0000 |
| tree | 020c26208e10ffe1839e16dd3c0994d576f8f9fc | |
| parent | d3e22605c482f8e1e20edb3644e85d259bbb626d [diff] | |
| parent | 16e200fb141bdfb05bbc0a61511a4ca6f1344777 [diff] |
am 862718b5: am ee47386a: am 0e26977c: Merge changes from topic \'trusty-gk-km\'\' * commit '862718b592f11f1c1027c35565bd5b6823804699': [core][trusty] add gatekeeper module [core][trusty] add keymaster module