| commit | c543f70e3d42da26a2fec37db02cb450c8b1c51d | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 30 06:11:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 30 06:11:04 2022 +0000 |
| tree | 156f78d6d92480d26e23230c99810542928d25c8 | |
| parent | f3a82a3b5980a86b46f5bbe7e084343f77fb5b41 [diff] | |
| parent | 8bb5e98ecbb90357690ee5eaf9dcf0e0e703118b [diff] |
[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625677 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659051 Change-Id: I44b0bee5c0ba597407652dd2c1af868adcee724a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>