commit | 41a3026a47f693e8893edf73172143a5b4fa554e | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Wed Mar 09 10:05:06 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 09 10:05:06 2022 +0000 |
tree | 090a787f751bcb3a67e0db8b890975638ba8a29d | |
parent | df5b4f0bad0da15a774acd6ad4de162393259f72 [diff] | |
parent | 0cf175a248033115359183bcf03cb0bbf6e4bc95 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -s ours am: 0cf175a248 -s ours am skip reason: Merged-In Ifa8dfd7f0d452b9e8e47e719eefadf26eee4309f with SHA-1 18e2057de2 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2013280 Change-Id: I9b778e2ccbaf36fc7f4ad2ae72a6ff008396d11a