| commit | aaaf4f100e3803861042f12785304849f7026ce5 | [log] [tgz] |
|---|---|---|
| author | Hai Shalom <haishalom@google.com> | Thu Mar 09 05:47:19 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 05:47:19 2023 +0000 |
| tree | 78dfc140138f9952f42b1a7506539a339b46735f | |
| parent | b821ef2598500b79abe3809b83f369054915b47a [diff] | |
| parent | ad6c0124c55ab2645dcb509741aa502e302dd157 [diff] |
[automerger skipped] [conflict] Merge "[TOFU] Implement a secure TOFU flow" into tm-dev am: 98104f2d2d am: ad6c0124c5 -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: Iab7ec1b98a7404ece847c4be297abcb309e4ad6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>