| commit | 16e200fb141bdfb05bbc0a61511a4ca6f1344777 | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Wed Sep 16 22:09:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:09:28 2015 +0000 |
| tree | 621fc675a88d1a106ed98ee1a88f535daac193d0 | |
| parent | a1e452f695036d528a85d8e05bc46d65fd27dcea [diff] | |
| parent | f50d86d0ccde6701dd283e6f8a7da1e68ecd2382 [diff] |
am ee47386a: am 0e26977c: Merge changes from topic \'trusty-gk-km\'\' * commit 'ee47386aa3074dbcff9c2fc757687d34721b66d9': [core][trusty] add gatekeeper module [core][trusty] add keymaster module