| commit | f50d86d0ccde6701dd283e6f8a7da1e68ecd2382 | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Wed Sep 16 22:03:18 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:03:18 2015 +0000 |
| tree | a635e1ea8dc73c7178c23621eff6717dc983e98c | |
| parent | dd71447e4a485aa13e6c4b2195831128189d9ea2 [diff] | |
| parent | 902d4e21166e9ade0ab6215636115a7b0bb6a2e8 [diff] |
am 0e26977c: Merge changes from topic \'trusty-gk-km\'\' * commit '0e26977c56c53a4ffc65d1680bbad4478c23111c': [core][trusty] add gatekeeper module [core][trusty] add keymaster module