| commit | da6e4b96268256cbb1e2b8c085e9321da06a1d19 | [log] [tgz] |
|---|---|---|
| author | Andres Morales <anmorales@google.com> | Wed Sep 16 23:05:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 16 23:05:10 2015 +0000 |
| tree | 7776fdb03c17d8bd68fb77802d3ffdd9da1fa7f0 | |
| parent | e5f8bbe11e16f60077f224ff3679497f3d1a41a1 [diff] | |
| parent | bb668fb426eba4ec6ec0f5e772f0cf0f1870e9dc [diff] |
am 5750ff3f: am f0748068: am 9dde5667: Merge "Revert "[core][trusty] add keymaster module"" * commit '5750ff3fb65a09925d9ac110d409145bb9cb21e5': Revert "[core][trusty] add keymaster module"