| commit | 718d5a4d2f316d027e83e5f01269278568047981 | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 30 07:33:49 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 30 07:33:49 2022 +0000 |
| tree | 30632d9d095495ae4bbabd02f629a87295280a9a | |
| parent | 692a08086e512d0f71a23ab5de5e6a005a2fa046 [diff] | |
| parent | b1cf2a0cd2d1c8dafe89418ae6be075ed6784494 [diff] |
[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -s ours am: b1cf2a0cd2 -s ours am skip reason: Merged-In I2f9f9bdba37f4ebfaea56c1a6662f0474ae8a002 with SHA-1 38fe45b539 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18659051 Change-Id: Id2ee63db92aae509297f6e014a03fe7ccf574497 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>