diff options
author | Xin Li <delphij@google.com> | 2022-08-17 00:30:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-17 00:30:36 +0000 |
commit | dc345a71c3f55e0c65c12fd45f705976e7d7aaad (patch) | |
tree | 844241db9ff83f70290665e85a9239cad48d93d3 | |
parent | 4b5382fa83df013c100834e7ddfaa258f7921a8b (diff) | |
parent | 16aed59b07b17c91676a20f0d8c0e596e71bd3ee (diff) | |
download | ukey2-dc345a71c3f55e0c65c12fd45f705976e7d7aaad.tar.gz |
[automerger skipped] DO NOT MERGE - Merge Android 13 am: fa54746370 -s ours am: fa16033923 -s ours am: 16aed59b07 -s oursub-automotive-master-20230622ub-automotive-master-20230427ub-automotive-master-20230303ub-automotive-master-20221215android-u-beta-1-gplmain-16k-with-phones
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: I5d5c9caea96ba8bfce728a95a8d53d40e46fa511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
0 files changed, 0 insertions, 0 deletions