| commit | 4ffd6b6152ec4a7de10de58c56cb4fc36e4b8ba7 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Thu Nov 14 08:05:57 2019 -0700 |
| committer | Shawn Willden <swillden@google.com> | Fri Nov 15 09:11:03 2019 -0700 |
| tree | b4ed1f02ff8dfceaa84bea38f28f6c3defe1b6f1 | |
| parent | c924fdb6790217c08a41565c4060205187f2fb31 [diff] |
Add hashes for Keymaster 4.1 KM4.1 is actually landing in AOSP, but it creates a merge conflict. This is to deconflict the merge. Test: N/A Change-Id: If0705662121c91f7f4a5753bba9e2f9a07890686