diff options
author | Xin Li <delphij@google.com> | 2020-09-11 03:33:41 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-11 03:33:41 +0000 |
commit | fbc0f3504f3e0e26f523e1adac00e01f4ee53728 (patch) | |
tree | 99a6f20963d7d89d8fd066d42841932fd0a0f7e9 | |
parent | 34b3396a8f7425965622c6aca20789fe9d65d517 (diff) | |
parent | 42884748d36a29b5ad9c5908136999246264278d (diff) | |
download | setupwizard-fbc0f3504f3e0e26f523e1adac00e01f4ee53728.tar.gz |
[automerger skipped] Merge Android R am: 19f9fc18c9 -s ours am: ba660c4ec7 -s ours am: 42884748d3 -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: Ie9b6dc641bb2378241a308a76df95917e563df80
0 files changed, 0 insertions, 0 deletions