| commit | 548478515028f85310d32f81088a82d89663474b | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:52 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:52 2021 +0000 |
| tree | 033a2ea54f61c1238a5e634fdcc6ee9b4c81fc3a | |
| parent | 8ccba1c3fb7ab087751f5f4e3b9b4afac5a93e46 [diff] | |
| parent | c64a4d35aaffc69eb8fe99989870a974cb30bdc9 [diff] |
[automerger skipped] Merge Android 12 am: 7decde0991 -s ours am: 75d50e6d2b -s ours am: c64a4d35aa -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: Ia21dab25c17bb56c49bdbd239b7b72bf28e226f7