From: Eugene Susla <eugenesusla@google.com>
Date: Wed, 26 Apr 2017 00:36:49 +0000 (+0000)
Subject: Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466
X-Git-Tag: android-x86-8.1-r1~508
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=43371da3ad6a320f882556dcbbc5cf6320baafd0;p=android-x86%2Fframeworks-base.git

Merge "Remove underscore from Companion service name" into oc-dev am: 885b5f4466
am: 56620feed0

Change-Id: I3a35f668dde82a8ccb1094988943039b4c93e4fa
---

43371da3ad6a320f882556dcbbc5cf6320baafd0