| commit | faf4fa0e69ce442b42dfaef394f3ed42d0cb78cf | [log] [tgz] |
|---|---|---|
| author | Wenhao Wang <wenhaowang@google.com> | Mon May 30 08:50:30 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon May 30 08:50:30 2022 +0000 |
| tree | 49158ec0af7a35b236024fb490d38a87d6a17883 | |
| parent | 140f9fc9e0b6c467a9d6e5974348b7dbc34e9338 [diff] | |
| parent | a10124141ce46679ca49abd64ab8837d994bb6b4 [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: 718d5a4d2f -s ours am: e9f7ca4fd5 -s ours am: edfc3fa2ae -s ours am: a10124141c -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: I630afc18ec0c42398276e0ab7c72a043eda405cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>