| commit | 725a3abb4d842b662febe2f5018fc350cc6e4fee | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:30:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:30:10 2021 +0000 |
| tree | 947609294616aea53039a3514bb6ac7af0e04c7d | |
| parent | a7534ee0575965e600daae7fbb8b9fc37ffa6310 [diff] | |
| parent | a429fac76295bb3f52007071b8e6482dd46d4490 [diff] |
[automerger skipped] Merge Android 12 am: 961085a273 -s ours am: 3b59093a0a -s ours am: d843abb770 -s ours am: a429fac762 -s ours 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: I7079704ae8e35aee16679338d36e803fc6419237