Merge "ContextHubService: Hack in Google vendor value" into nyc-mr1-dev
am: 143aaa6d05
Change-Id: I9104870e67e6fe86f294be831575a8c79549fd45
This commit is contained in:
am: 143aaa6d05
Change-Id: I9104870e67e6fe86f294be831575a8c79549fd45