| commit | 16aed59b07b17c91676a20f0d8c0e596e71bd3ee | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Tue Aug 16 23:58:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 16 23:58:30 2022 +0000 |
| tree | 844241db9ff83f70290665e85a9239cad48d93d3 | |
| parent | d476a17d973f599e759a1915e7344b004b5f4646 [diff] | |
| parent | fa16033923d8fd86f557352ca31d69b7ad4230e0 [diff] |
[automerger skipped] DO NOT MERGE - Merge Android 13 am: fa54746370 -s ours am: fa16033923 -s ours am skip reason: Merged-In Iad70e328fcfe84171dae9a83a0981686e7503e9b with SHA-1 239ca39078 is already in history Original change: https://android-review.googlesource.com/c/platform/external/ukey2/+/2186777 Change-Id: I2550d8fdd6e7e0074ef97982e1f780c7470d5378 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>