tree 4e2b7cdf94798fd6f5893a7bb2c0265496d558c1
parent b67a5b50fa5ac3dc60d1114ccbce00462b4aabba
parent 246c14d6daac279c7f24b08fe2917cb7c1f247c6
author Tianjie Xu <xunchang@google.com> 1618379751 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1618379751 +0000

Merge "Improve the error handling for armRebootEscrow" am: 246c14d6da

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

Change-Id: I5fc640360434adc032c2bc3691e9fd15eb5ea4b9