diff options
author | Xin Li <delphij@google.com> | 2021-10-08 07:57:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 07:57:12 +0000 |
commit | a429fac76295bb3f52007071b8e6482dd46d4490 (patch) | |
tree | 096454abf50a73063ca997f864b3d5f3255a5899 | |
parent | 2f5adc3e76cbe5c14d334e69c440b14025663f75 (diff) | |
parent | d843abb77040fb9e18ad2e85756261e5eb392d6c (diff) | |
download | setupcompat-a429fac76295bb3f52007071b8e6482dd46d4490.tar.gz |
[automerger skipped] Merge Android 12 am: 961085a273 -s ours am: 3b59093a0a -s ours am: d843abb770 -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 I40ce7b1692e93617aec9de7a0d3a8b154fdf7a02 with SHA-1 27fa29e45b is already in history
Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1847596
Change-Id: I33eeff07f0dbedf8997dbb38dbf236564eab47a8
0 files changed, 0 insertions, 0 deletions