OSDN Git Service

resolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp
authorPhilip P. Moltmann <moltmann@google.com>
Fri, 7 Apr 2017 03:25:37 +0000 (20:25 -0700)
committerPhilip P. Moltmann <moltmann@google.com>
Fri, 7 Apr 2017 03:25:45 +0000 (20:25 -0700)
commitd45000c1a9ea75421f5d56145097bbd25ef7d8ef
tree7df8dfd7262acfa082f39f9c54a88104ab09fca4
parentd17977dea340f7a38c7cd766a0fca9d77363d68d
parent3c002e45dda1e594750abf63a2ed4a1e3816d36f
resolve merge conflicts of 3c002e45dda1 to oc-dev-plus-aosp

Test: Trivial resolution
Change-Id: Ifc41cc692406d52f508b595465f4f7469f74c6f5
api/system-current.txt
packages/PrintRecommendationService/src/com/android/printservice/recommendation/RecommendationServiceImpl.java