summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 01:39:37 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 01:39:37 +0000
commitc64a4d35aaffc69eb8fe99989870a974cb30bdc9 (patch)
tree033a2ea54f61c1238a5e634fdcc6ee9b4c81fc3a
parent896aff4f56f0983665ad77c475250254afde951c (diff)
parent75d50e6d2be3d6675524969b124bdbe58c57d745 (diff)
downloadsetupwizard-c64a4d35aaffc69eb8fe99989870a974cb30bdc9.tar.gz
[automerger skipped] Merge Android 12 am: 7decde0991 -s ours am: 75d50e6d2b -s ours
am skip reason: Merged-In I08740b2e36340d196b0a64d1ab75ae2d3541b603 with SHA-1 0cc7edea8e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/setupwizard/+/1847362 Change-Id: I46e7162feaef6f8fbeb9d2e7016b104d16b8570e
0 files changed, 0 insertions, 0 deletions