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)
commita9ceb9ebac1a95acc03574c89b50bbfcb5cd67a2
treeb8c5515d1369444d8cad6b6ac6898504a0a9cebb
parent49750a0448305b906a1ad544253ccd4bcb78914f
parentef5d594abbe2269545f19ba4a83e2904d88372aa
Merge "Merge "Change the name of the contexthub service." am: fba752e64c am: 8a3f7c0738 am: cf33fd7910" into nyc-mr2-dev-plus-aosp
am: ef5d594abb  -s ours

Change-Id: Ib00d39fe1102bbe95171620420dc1016f02502dc