summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 07:58:31 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 07:58:31 +0000
commit6fe04f365351fb1d797f51912ed45c56c1303da5 (patch)
treefa0429fae76936b9bc212aa5ddd323759bc005fc
parent481321b6506f3de90288d295592d5893d263f3c5 (diff)
parentba05aa630001336fb0bfe4a5f5b596697069087d (diff)
downloadsetupdesign-6fe04f365351fb1d797f51912ed45c56c1303da5.tar.gz
[automerger skipped] Merge Android 12 am: 1bdd18355e -s ours am: 51d86f2726 -s ours am: ba05aa6300 -s oursandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1
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: I51b50fad68d07273d406e83c178c4e6e340e54e4
0 files changed, 0 insertions, 0 deletions