summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 08:29:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 08:29:50 +0000
commit120a178823b95cf7474d9f221e0b6ab48c5cf7f1 (patch)
tree033a2ea54f61c1238a5e634fdcc6ee9b4c81fc3a
parenta2f2fc6b939db052e9a6b0cfaa7831e4afb6645a (diff)
parent548478515028f85310d32f81088a82d89663474b (diff)
downloadsetupwizard-120a178823b95cf7474d9f221e0b6ab48c5cf7f1.tar.gz
[automerger skipped] Merge Android 12 am: 7decde0991 -s ours am: 75d50e6d2b -s ours am: c64a4d35aa -s ours am: 5484785150 -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: I184104d8e94f19c769e6a56c91ddd7c4f7fefaf5
0 files changed, 0 insertions, 0 deletions