summaryrefslogtreecommitdiff
path: root/libs/gui/SyncFeatures.cpp
diff options
context:
space:
mode:
author Devin Moore <devinmoore@google.com> 2020-08-12 00:51:14 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-12 00:51:14 +0000
commit90f1e105533cecf0c3ae0480516d5533855fa851 (patch)
tree8ee2822e74a11c2285b742d9a6d1c29c0389ff1e /libs/gui/SyncFeatures.cpp
parent17ea2e42a89761c6c9bff449336b2fa78daa8c40 (diff)
parentbeb62f93af46533860ef8a1178a4c0a88d9c11e3 (diff)
[automerger skipped] Merge "servicemanager: Overwrite old service when a new one is registered" into rvc-qpr-dev am: b05270227e -s ours am: beb62f93af -s ours
am skip reason: Change-Id I8835d9f7505367d83a0f29f1d928a07b3d57e56a with SHA-1 05ffe52b33 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/12334501 Change-Id: I61c2d1f469ae1efc858663bf1ffa691b5ffbeb0c
Diffstat (limited to 'libs/gui/SyncFeatures.cpp')
0 files changed, 0 insertions, 0 deletions