tree 31536d98076b06198185bedadf8a661f27fe399a
parent 775d4efd7849a13f78066c984004d004fc2755bf
parent 8f2306ace3e5bab493f6359544446a190d9c0587
author Xin Li <delphij@google.com> 1650430056 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650430056 +0000

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 6301ff0095 -s ours am: 8f2306ace3 -s ours

am skip reason: Merged-In I2a5da348eba104a7d06d6c0acb3cd56b770142a1 with SHA-1 a292f5280e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/adb/+/17805729

Change-Id: I18f9fc1d1c3b3ff6d3a99211d8d710d0138a6f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>