Merge "[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: faf4fa0e69 -s ours am: 96f32d7cd3 -s ours"
This commit is contained in:
committed by
Android (Google) Code Review
commit
bdb904910a