tree 119bc5a8390aaeb3b03179154e19b15d92ec1a7c
parent 384dd713d64cc6e2cb1d0dac70ac44378e3f7786
parent 149a6bb7fe0a1b2bf42d1e76920e3d9bca7c39d7
author Xin Li <delphij@google.com> 1650434150 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650434150 +0000

[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: b410e90021 -s ours am: 149a6bb7fe -s ours

am skip reason: Merged-In I4cb84aa9b69ff872f5de7a5e9c5ca1e3405d2d8b with SHA-1 1c4b981c71 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/update_engine/+/17805407

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