tree 144c7b0cfa75c6c62ab58c5702603ef6cccb9372
parent a0dd446e6101fe84a0c8d1135eec6243591c82fe
parent 3836a8a8de37a899c4da8077f8f5bd5a632fb56c
author YK Hung <ykhung@google.com> 1669170720 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1669170720 +0000

[automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours

am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

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

Change-Id: I1c3342037844ada6a10e6b822940d0541ec4ce19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>