| commit | 8b9ca3110df34864b400358a943be9b33c3ecf2a | [log] [tgz] |
|---|---|---|
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 01:11:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 01:11:04 2022 +0000 |
| tree | ede9f9fc395093f237bfb525c43fa3a1901526bd | |
| parent | 98ff58fb85dc4a4d605f5f09994a4e2c49e0753d [diff] | |
| parent | aa6d2eacf47e87c7d7f7a99255051aa038636c15 [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: aa6d2eacf4 -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: If69569f83b728bb3c12a3b32867a70cf9dfba885 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>