tree 376fe145e63feafb66166e16c34303a864576d5e
parent b6ec86f92728ecde202deba565e61a78edbc14ff
parent 8e70c15347cbd016f05b82fd5860e9feb30dbc71
author Jason Chiu <chiujason@google.com> 1689747173 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1689747173 +0000

[automerger skipped] Merge "Guard against NPE in the Settings Tile lib" into udc-d1-dev am: 7913e25503 am: 56bc852fe1 -s ours am: 8e70c15347 -s ours

am skip reason: Merged-In I41556971cd9e46cf68e6db606e9ee9f5d49e53b5 with SHA-1 164d20856e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24112146

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