| commit | 5353ec6c327e2821fa0f88acd55dee5f40a6b5c2 | [log] [tgz] |
|---|---|---|
| author | Hai Shalom <haishalom@google.com> | Thu Mar 09 06:18:30 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 09 06:18:30 2023 +0000 |
| tree | f17bcc6c18750d74f4c4fe7b9e7c1173fd4263de | |
| parent | c4c6a58dae656af6eb28815138922734c3534ea6 [diff] | |
| parent | aaaf4f100e3803861042f12785304849f7026ce5 [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 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: I0219a1f72b8f8604e621ee440cefb35141be69cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>