commit | 2510beb088ef55e67059b1120235420652e321ff | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:12 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:12 2020 +0000 |
tree | de8eb078a0074d3f7b16aeab032338e98e31a661 | |
parent | ff915506911d11460ba5d12cddf096a8fa6857a8 [diff] | |
parent | 10bed78b069a31a4f944be9b495ba656d728bedb [diff] |
[automerger skipped] Merge Android R am: 29a787f806 -s ours am: 6fa1bca4f2 -s ours am: a88531e0a5 -s ours am: 10bed78b06 -s ours am skip reason: Change-Id I64d2be5b9eba48e8269a898a585037e94a6b18e9 with SHA-1 3a6ef723d2 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/1421761 Change-Id: I75134b425cc1a24d2d2ebbe9693cc7b4c556b62a