OSDN Git Service

Merge "Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c07...
authorashutoshj <ashutoshj@google.com>
Thu, 29 Dec 2016 02:00:03 +0000 (02:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 29 Dec 2016 02:00:03 +0000 (02:00 +0000)
am: ef5d594abb  -s ours

Change-Id: Ib00d39fe1102bbe95171620420dc1016f02502dc


Trivial merge