| commit | ae8ccb30e87d17b2488283a11772a97fa60559fa | [log] [tgz] |
|---|---|---|
| author | Hai Shalom <haishalom@google.com> | Thu Mar 09 06:53:14 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 06:53:14 2023 +0000 |
| tree | e30a1c9aa6b835f086fcfb1e23c5574a1482d6bb | |
| parent | f59ea5fe81b8f8ee3503d98d29f6185c7863cbf7 [diff] | |
| parent | 5353ec6c327e2821fa0f88acd55dee5f40a6b5c2 [diff] |
[automerger skipped] [conflict] Merge "[TOFU] Implement a secure TOFU flow" into tm-dev am: 98104f2d2d am: ad6c0124c5 -s ours am: aaaf4f100e -s ours am: 5353ec6c32 -s ours am skip reason: Merged-In I5cac12cd8c52a8a9425e98dad0fb90893f53e374 with SHA-1 d135643093 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Wifi/+/21805956 Change-Id: Id7642ffae5da530b30e6873d1157d828cb0bad14 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>