tree 2261682d4c825f95f539a3ad012e0ef89b77f044
parent aa8e23b212b6f1cbfb03f8a5d69739a750d2af0e
parent da512fa97c2013aff8b2fb9af4803b8f3721e1fc
author Xin Li <delphij@google.com> 1693267145 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693267145 +0000

[automerger skipped] Merge Android U (ab/10368041) am: da512fa97c -s ours

am skip reason: Merged-In I9dd0531b069ff70e7823d03ef888d28c0cafcdea with SHA-1 7dc0d830d9 is already in history

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

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