tree 99a6f20963d7d89d8fd066d42841932fd0a0f7e9
parent 75f61b59c556893538167c6a2f015fea16134c90
parent ba660c4ec7f9859a90b39eac39c3a13e66791fef
author Xin Li <delphij@google.com> 1599789770 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789770 +0000

[automerger skipped] Merge Android R am: 19f9fc18c9 -s ours am: ba660c4ec7 -s ours

am skip reason: Change-Id I4e01fbf5d6fd342573625b6e3ad0c2a387432920 with SHA-1 801d339361 is in history

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

Change-Id: If39c493093e746b7bb1c49d24b6510f47c578e45