tree c7fd37cdb223c6ea6fb915a34481e826d50cb791
parent 6d21df6bd8310d6856234c8a7c66aa40d1d3045a
parent d49b31e9ee7b06d88329e2d6f0535791a812fc94
author Kevin Liu <congxiliu@google.com> 1718402954 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1718402954 +0000

[automerger skipped] Add strict_mode: false am: 47e9c1cbf8 am: d49b31e9ee -s ours

am skip reason: Merged-In I28882c4b9165165988d6ddab36af328ccb43161f with SHA-1 aca1b9e0dd is already in history

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

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