tree d97a5035b1288bd8f77fd8e6a812d0b4645d5a52
parent ae628738128da51a94f2f8c70613d0499570ba39
parent 45c581df5376e9eb3308b9921fd44c4e1fd77c2b
author Xin Li <delphij@google.com> 1640072198 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1640072198 +0000

[automerger skipped] Merge "Merge SP1A.211205.008" am: 0bf1802bb3 am: 3be43ae165 -s ours am: 45c581df53 -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: I664100f166a7dadf818f19c71f0c9cd593a8f757