summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 02:02:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 02:02:50 +0000
commit42884748d36a29b5ad9c5908136999246264278d (patch)
tree99a6f20963d7d89d8fd066d42841932fd0a0f7e9
parent75f61b59c556893538167c6a2f015fea16134c90 (diff)
parentba660c4ec7f9859a90b39eac39c3a13e66791fef (diff)
downloadsetupwizard-42884748d36a29b5ad9c5908136999246264278d.tar.gz
[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
0 files changed, 0 insertions, 0 deletions