Merge "Remove underscore from Companion service name" into oc-dev am: 364644eb

am: 2cad0f48 Change-Id: Id87e7489c32cb0d0e9b87896fd4b0722412a8199

Merge "Remove underscore from Companion service name" into oc-dev am: 364644eb
0c399dc5 · Eugene Susla · android-build-merger · 8fed11ad · 2cad0f48 · 0c399dc5
Commit 0c399dc5 authored 8 years ago by Eugene Susla Committed by android-build-merger 8 years ago
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -22,7 +22,7 @@ com.android.net.IProxyService             u:object_r:IProxyService_service:s0
 commontime_management                     u:object_r:commontime_management_service:s0
 common_time.clock                         u:object_r:mediaserver_service:s0
 common_time.config                        u:object_r:mediaserver_service:s0
-companion_device                          u:object_r:companion_device_service:s0
+companiondevice                           u:object_r:companion_device_service:s0
 connectivity                              u:object_r:connectivity_service:s0
 connmetrics                               u:object_r:connmetrics_service:s0
 consumer_ir                               u:object_r:consumer_ir_service:s0