tree 69703a82376a2c7bbebf23425d7ea7fe3c2a2b8a
parent d9caa80044e79536a69eaecc5bca8acc9c908ad5
parent ee605797983ae306d92852475b8ad81ff5223ea1
author Shuo Qian <shuoq@google.com> 1614586593 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614586593 +0000

[automerger skipped] Merge "Add Emergency callback mode shell command" into rvc-qpr-dev-plus-aosp am: ee60579798 -s ours

am skip reason: Change-Id If6ca01283a02a4c1f762eaa0f4cd798d48781761 with SHA-1 b201f9b1e6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id655eaab13a3b1527a64fc121dd697855fb4f6c0