tree 7a5b17ba458bcdc2e43cd0b4c060516363ac7f46
parent b6d7715782b69aa1ee4f7e26c06ce9de2ca4d965
parent 2c4a76857739393dc5fb7ca74f9aa71867002df8
author TreeHugger Robot <treehugger-gerrit@google.com> 1595287512 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595287512 +0000

Merge "Resume-on-Reboot: remove special string" into rvc-dev am: 4daab7b2d6 am: 5cb5825c09 am: 2c4a768577

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

Change-Id: I918a357d8d7460abd9ae0070afd1cc4793296511