commit | 3f6535f1f0408a094348dcd80fdb6d91349d6cce | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 08:29:47 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:29:47 2021 +0000 |
tree | 9eeaf1312b70b40e357dff44b07ee03173d59231 | |
parent | de33f1224b0a6a4c82bf2545ee25a8e155244588 [diff] | |
parent | f6ff7843051c233ae623ab0e3f2b20401330cc6d [diff] |
[automerger skipped] Merge "Merge Android 12" am: 433825250d -s ours am: 7062f8326d -s ours am: b2fadd3b8a -s ours am: f6ff784305 -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: I2fde09fc444eaf6e6dc503d5013ad12c5ffc2494