| commit | a04070ac8d70af53a988f6daa0e52dd215f21d73 | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Wed Sep 16 22:50:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:50:36 2015 +0000 |
| tree | d1c268acf908f87c85f201d439674846863384ce | |
| parent | f50d86d0ccde6701dd283e6f8a7da1e68ecd2382 [diff] | |
| parent | a9e971f59ad0a58838ca74fdf64f5184e32779e0 [diff] |
am 9dde5667: Merge "Revert "[core][trusty] add keymaster module"" * commit '9dde56672b003d862f253711b023e3d3d675443b': Revert "[core][trusty] add keymaster module"