tree b99d1be1b9867f56512ee8be3f2414066cb49aa1
parent be591d709c8b45248b91b1faa15580eccaa31499
parent d942893d86a44fba0b5c5959a98f5d05dc7f9fdd
author Philip P. Moltmann <moltmann@google.com> 1465501233 +0000
committer android-build-merger <android-build-merger@google.com> 1465501233 +0000

Merge \"Merge \\\"Handling of Fuji Xerox in RecommendationService.\\\" into nyc-dev am: 5398f2731b am: d9ea338c96\" into nyc-mr1-dev-plus-aosp
am: d942893d86

Change-Id: I0e6762676a66e4fd1ffbb703bf04bc482a460414