| commit | 1c5e5fe44435ce7634d6488019ad9671f7b0dfe5 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Tue Mar 09 19:59:36 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 09 19:59:36 2021 +0000 |
| tree | fc567002e2b6d12e6f4edf62db6c675d19fbbbdc | |
| parent | 1f3a49233f4855bfc748295699cd8730faaa2e2f [diff] | |
| parent | aae8912a371af81423bf844770c63a297c921f0d [diff] |
Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01 am: aae8912a37 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1623182 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I81d0d2d799150d8bcf66b350b9a52998999b347a