commit 2102bf638603e8613a8f8951843c251b2a229203
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Feb 15 22:02:18 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Feb 15 22:02:18 2018 +0000
tree 83e407df46061371b56ef42101990401b276aa88
parent dddd3479590fb101e1d57b047a501babe6346e85
parent e5b517e3eed20097675ddaa1d005ba572e3648e5

Merge "Merge changes from topic "cp_calin_framework_2017" am: b98102b4dc am: b3da44d9a1 am: 5a0b4c4c62  -s ours"

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 75bb5e4..61c8b79 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -196,7 +196,7 @@
     private static final String THERMAL_OBSERVER_CLASS =
             "com.google.android.clockwork.ThermalObserver";
     private static final String WEAR_CONNECTIVITY_SERVICE_CLASS =
-            "com.google.android.clockwork.connectivity.WearConnectivityService";
+            "com.android.clockwork.connectivity.WearConnectivityService";
     private static final String WEAR_SIDEKICK_SERVICE_CLASS =
             "com.google.android.clockwork.sidekick.SidekickService";
     private static final String WEAR_DISPLAY_SERVICE_CLASS =