commit | 0cf175a248033115359183bcf03cb0bbf6e4bc95 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Tue Mar 08 11:06:35 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 08 11:06:35 2022 +0000 |
tree | b81d5af25234c037ab68d8018ec99c79483dfb6f | |
parent | d77cc961267fd6c816c70ddcd47cf5a7cb85d4f9 [diff] | |
parent | 4ea5f0e2e913ff91b6e7fb7c7e1e7641fce462e9 [diff] |
[automerger skipped] Merge "Merge Android 12L" am: 41790c684b -s ours am: 4ea5f0e2e9 -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: I27a745bdaa46d24d78ae8e50419c987a944cbb3e