commit | ee47386aa3074dbcff9c2fc757687d34721b66d9 | [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 | c7c9451f98897ca304883c7edb166b81bffd7784 [diff] | |
parent | 0e26977c56c53a4ffc65d1680bbad4478c23111c [diff] |
am 0e26977c: Merge changes from topic \'trusty-gk-km\'\' * commit '0e26977c56c53a4ffc65d1680bbad4478c23111c': [core][trusty] add gatekeeper module [core][trusty] add keymaster module