tree 99a6f20963d7d89d8fd066d42841932fd0a0f7e9
parent 8d2737e20a56addbf718aba9bc9bdc0c38e8c236
parent d1df96afb17cbf11dae70b1fb192abaa3cb0eb97
author Xin Li <delphij@google.com> 1599011975 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599011975 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 801d339361 -s ours am: 75f61b59c5 -s ours am: 34b3396a8f -s ours am: d1df96afb1 -s ours

am skip reason: Change-Id I3a6d30448b2248807a5edf579f72bb6ed885b75e with SHA-1 8d2737e20a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/setupwizard/+/12470188

Change-Id: I52f8e41cb97261549e777023456281ba5e57038c