commit | 5b3348af241220a815a0a9cd934354749e0be493 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 08:31:29 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:31:29 2021 +0000 |
tree | 1b03d44ba779931b7f5ca187fae5a2d562042bd3 | |
parent | e10fb88c82e641e27124255938e998f908927482 [diff] | |
parent | 6fe04f365351fb1d797f51912ed45c56c1303da5 [diff] |
[automerger skipped] Merge Android 12 am: 1bdd18355e -s ours am: 51d86f2726 -s ours am: ba05aa6300 -s ours am: 6fe04f3653 -s ours am skip reason: Merged-In I38da9f192d57688b1b05bb2bf41ce33f87a60807 with SHA-1 e595fd650a is already in history Original change: https://android-review.googlesource.com/c/platform/external/setupdesign/+/1847439 Change-Id: Ie09965dea93c0946fa9d1318b0ec9e0dc9bdbbb0