| commit | bb668fb426eba4ec6ec0f5e772f0cf0f1870e9dc | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Wed Sep 16 22:58:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 22:58:33 2015 +0000 |
| tree | 63d4948c1b28b7a6e750f817436d38573092730c | |
| parent | 16e200fb141bdfb05bbc0a61511a4ca6f1344777 [diff] | |
| parent | a04070ac8d70af53a988f6daa0e52dd215f21d73 [diff] |
am f0748068: am 9dde5667: Merge "Revert "[core][trusty] add keymaster module"" * commit 'f07480681deacf156913cf1ce08f3e3bdf79dc14': Revert "[core][trusty] add keymaster module"