tree 9aa842a962a01b872b707f8396bc6e660c02aeff
parent 84812f6d12e6bc116e84515a71b18c96956a63f0
parent db8ed62e016b95dc2c6b8b2fe6878b849765b2e3
author Tianjie Xu <xunchang@google.com> 1615317788 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1615317788 +0000

Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9aec1678237a4d243da65d21f65026f5334591c3