commit | 6ab1e93ace971f403a58ddfae4619e2a655ae097 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:01 2020 +0000 |
tree | e286d0861431bd97e23d171f456c343fc3ae980e | |
parent | 5a6c92858a7f7eac78ad226890f388fae776f368 [diff] | |
parent | be8aed1f5f5647c1ad423400597d52087b1a0566 [diff] |
[automerger skipped] Merge Android R am: 0870f9d7e8 -s ours am: 1a657cd147 -s ours am: 2f43e56e1e -s ours am: be8aed1f5f -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: I4979f0a9e2a069c02dd23717f444cabb326204ad