| commit | 78fe2eda6b26a8506ad301aa555e12e01559697a | [log] [tgz] |
|---|---|---|
| author | Christian Wailes <chriswailes@google.com> | Tue Apr 06 21:59:05 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 06 21:59:05 2021 +0000 |
| tree | 85d71fc43719ed213177e47ec47f755c0a77b098 | |
| parent | 32a5d19754b81b7613b72370c039c4631595651c [diff] | |
| parent | 6033dd2aa0d7c56c324c6acdc3956827f3422a44 [diff] |
[automerger skipped] Merge "Register ART Service with the System Server" am: c71c3ac9ab am: 1feef50cc1 am: 6033dd2aa0 -s ours am skip reason: skip tag Change-Id I9734160f1cd4fd9fc363b3af50e27ec8973be557 with SHA-1 09724a755f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1582868 Change-Id: If95b4d9401d43f10e69796d3d8c680e37bad34b7