commit | aecf07a9ab815e2b4e063ecdc29548a9a2e64cdc | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Sep 01 21:46:41 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Sep 01 21:46:41 2020 +0000 |
tree | 1c2cc4aba37948338affe41a86bc7b157d5fd302 | |
parent | b92d5ccbd3cd24e1349822bfccba86100d0fef69 [diff] | |
parent | 761661c4b50e44fd4ff78ce9ca602f0700872444 [diff] |
[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 602f4dd1cc -s ours am: 761661c4b5 -s ours am skip reason: Change-Id I2134676a178c19da694127050b3998b7fc1a357b with SHA-1 59aac7543c is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/system/update_engine/+/12470405 Change-Id: I0e23b5df16f8061bd713b9e53fe754504714d1dd