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