tree 720fc719874df18daa96ebf16b1a82e1bbaf4e40
parent 18a2206c351c62ddce622562d53b6ea2b83e385e
parent 5c92691dbbd281a3baf21ded9d0c12059a1a4499
author Xin Li <delphij@google.com> 1637143713 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1637143713 +0000

[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 07074eda4e -s ours am: 5c92691dbb -s ours

am skip reason: Merged-In I38a4fcc093c75c2bd590d0929921a9d40add01d1 with SHA-1 4700ef0f5c is already in history

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

Change-Id: Ib1eefe1886a2af223a04eaea1e38f6db60271011