commit | f6ff7843051c233ae623ab0e3f2b20401330cc6d | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 07:56:49 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 07:56:49 2021 +0000 |
tree | 8a8dbf6cd0a3801d52ac0ef26a170bce7f8d3301 | |
parent | 34ab8e70601785a3a9b7b9fa638cabfb7d317cbe [diff] | |
parent | b2fadd3b8a4dea71b9fccf4177ec8158d24f3b82 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours am: b2fadd3b8a -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: I2034dc23c36bb8565dc8a0e4775da3851631004e