| commit | 987825a49d5a63878df085784ba5a7f0cdb86fa3 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Oct 08 08:59:57 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:59:57 2021 +0000 |
| tree | 27d49f8fd48b03429bc0089b34b418b64d4b7661 | |
| parent | 630cbdc519c42fd58fe2b21efa8dd1f874ad00b7 [diff] | |
| parent | 3f6535f1f0408a094348dcd80fdb6d91349d6cce [diff] |
[automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours am: b2fadd3b8a -s ours am: f6ff784305 -s ours am: 3f6535f1f0 -s ours am skip reason: Merged-In Ib853137811901796f73e4d720accb3249a7db963 with SHA-1 8aa74d1ad4 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1847386 Change-Id: I575706371228b2628c1f3514817e23d57da18fa6