tree 31536d98076b06198185bedadf8a661f27fe399a
parent 94c08df18170f14e91c056ecdc2fbad78c7c6ed6
parent 5a67e63604c547a2c4961a46f8a0180cd58d7a4d
author Xin Li <delphij@google.com> 1650431610 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650431610 +0000

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: 6301ff0095 -s ours am: 8f2306ace3 -s ours am: 5a67e63604 -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: I0852694ca73cbade32739b5d4ce2d671569b14c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>