tree e286d0861431bd97e23d171f456c343fc3ae980e
parent 749dbef88b905cb6da84d7b33b4411a8d844fd9e
parent 1a657cd147f0ffc7d3e10c7afd17e97b81967e79
author Xin Li <delphij@google.com> 1599789759 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789759 +0000

[automerger skipped] Merge Android R am: 0870f9d7e8 -s ours am: 1a657cd147 -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: Ie161047186da265b59c7a0458ffae384ed838a2a