tree c7fd37cdb223c6ea6fb915a34481e826d50cb791
parent 6be1babee4d60a2cc339631375a997d6cfd291e8
parent c3deb538ca62ad81bc9f248947f6fc8203be7072
author Xin Li <delphij@google.com> 1718916648 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1718916648 +0000

[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: c3deb538ca -s ours

am skip reason: Merged-In I4ddef80d27ceffcf66b3b5db165af78fa4326e58 with SHA-1 400d660983 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/EmergencyInfo/+/27908429

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