| commit | f07480681deacf156913cf1ce08f3e3bdf79dc14 | [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 | ee47386aa3074dbcff9c2fc757687d34721b66d9 [diff] | |
| parent | 9dde56672b003d862f253711b023e3d3d675443b [diff] |
am 9dde5667: Merge "Revert "[core][trusty] add keymaster module"" * commit '9dde56672b003d862f253711b023e3d3d675443b': Revert "[core][trusty] add keymaster module"