| commit | 5fa6463efbe82237e2a2d46a49d7fc02d806f14b | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Nov 03 16:58:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 03 16:58:25 2020 +0000 |
| tree | 6a52cbea90209631e0edad7f9fccf3fad5f10c19 | |
| parent | a44d144119612cf4bf59ee685c77e9fc9cbf2f83 [diff] | |
| parent | 6a7fa9b3e17f9497df668b8d78b13d28d675fa6f [diff] |
[automerger skipped] Merge "keymaster_defs: Add missing tags added in KM 4.1 and earlier." am: b1b3cd4669 am: 11e5a32f9f am: 1fb44edc64 am: 6a7fa9b3e1 -s ours am skip reason: Change-Id Ie01cbc50d9bc77150adc46962d06cda2a7c1544a with SHA-1 a7de85db82 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/libhardware/+/1480396 Change-Id: Id5cd669a99c877ede59f60a8f9ce170a5efbf2d9