OSDN Git Service

Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738...
authorashutoshj <ashutoshj@google.com>
Thu, 29 Dec 2016 01:59:48 +0000 (01:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Dec 2016 01:59:48 +0000 (01:59 +0000)
am: 3659363d06  -s ours

Change-Id: I40d4f12980f2068e1ad81d1c69ef0bb0489dcc80


Trivial merge