| commit | aa6d2eacf47e87c7d7f7a99255051aa038636c15 | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 00:50:34 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 00:50:34 2022 +0000 |
| tree | a282fa8bc795d1e9960f5be47c43915b9f5a7056 | |
| parent | 8b84b1936304cd5281f3e0baaea8269ebe3250ed [diff] | |
| parent | 3f04f905ce1c8a1527dccca02db424bde7e8a889 [diff] |
Merge "[automerger skipped] Merge "Merge "fuzzy_fastboot: use 'tcp:' prefix to identify fastboot protocol." into android10-tests-dev am: da84e29fdf" into android11-tests-dev am: 48ca333cb6 -s ours" into android12-tests-dev am: 3f04f905ce -s ours am skip reason: Merged-In I971fd9e25741e18bf7f5907d562556b09db1d624 with SHA-1 0e743a25c9 is already in history Original change: https://android-review.googlesource.com/c/platform/system/core/+/1364665 Change-Id: I534a29b1f75233c78af0563b1caebb38c98c9fae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>