tree e286d0861431bd97e23d171f456c343fc3ae980e
parent 37d6f3c32217b31330360aecb1b17fcd791da3c1
parent 0870f9d7e80b974a1ab19f2baa792220febe9bd2
author Xin Li <delphij@google.com> 1599784809 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784809 +0000

[automerger skipped] Merge Android R am: 0870f9d7e8 -s ours

am skip reason: Change-Id Ida5549b52c29abc2a7305c32dccc955d331937c2 with SHA-1 443bd55ac2 is in history

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

Change-Id: I15c131d6f3a25a8743fd34269ee01da29730731b