| commit | b1cf2a0cd2d1c8dafe89418ae6be075ed6784494 | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 30 06:58:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 30 06:58:02 2022 +0000 |
| tree | 253b55ea175ad9d95cddebf2fa6847d33ea9a792 | |
| parent | f03f3fad8b3b80a738e3ca69b6cfad3d521cd857 [diff] | |
| parent | aa456df74ebf1428cc456a65ffc360a948854bc3 [diff] |
[automerger skipped] Revert "[conflict] Move service initialization am: 38fe45b539" am: 8bb5e98ecb -s ours am: c543f70e3d -s ours am: aa456df74e -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: I5926ea7d571c78eae47ca529cb0a166c2a718519 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>