commit | 8b84b1936304cd5281f3e0baaea8269ebe3250ed | [log] [tgz] |
---|---|---|
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 00:50:32 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Apr 21 00:50:32 2022 +0000 |
tree | a282fa8bc795d1e9960f5be47c43915b9f5a7056 | |
parent | 096a880fc7a4bbaca1810a60492bb38cf4051db7 [diff] | |
parent | ca3aa04b1b82bfc2b0c8f216f18f5f341d1b4bb7 [diff] |
[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 am: ca3aa04b1b -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: I60af1543461fa7debbcb1de4651b14ace0f10edf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>