| commit | e3f5fdfa9ce096df16e1af5e5a89bc7d3db80cfd | [log] [tgz] |
|---|---|---|
| author | Allen Webb <allenwebb@google.com> | Mon Jan 22 16:29:59 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jan 22 16:29:59 2018 +0000 |
| tree | 39bf76491663396d26fc33c291a64aad0349ac03 | |
| parent | e437a074fa62b7b42d7d8b374f7be31f386fe059 [diff] | |
| parent | ee4dd0991850742b0b7d0b95b4c11be744b98628 [diff] |
Merge "base: core: java: android: security: keymaster: Synced with updates to keymaster HAL."