tree d643cd54e03eb172aed40272ff0eba95e8da5bf6
parent 75b382f80efcf432c1497223fca7c843f87c32f5
parent bf2e17f4b95ae9df9709bf45243f3f8a92787f45
author Xin Li <delphij@google.com> 1640073011 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640073011 +0000

[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3 am: 3be43ae165 -s ours am: 45c581df53 -s ours am: bf2e17f4b9 -s ours

am skip reason: Merged-In I84848a2801172b46f7cc3ff39d88ad57e34514a4 with SHA-1 050b6d5224 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1930705

Change-Id: Ie9a257778489a39e27ef3ed36d23f4fd2b266e53