tree 174fd0d290b2d504b9422aece368fcb7b8a68bf0
parent 5058633a587a80cdb1a6d8fb5d8e047f10e99962
parent ad9ff9c59af367f51f24ce72492eb3eaa5eac27a
author Jeremy Joslin <jjoslin@google.com> 1484165768 +0000
committer android-build-merger <android-build-merger@google.com> 1484165768 +0000

Merge "Move getActiveScorerPackage() to the score service." am: b5488ec3b3 am: 425a0fdc95 am: ab9eb11e2f
am: ad9ff9c59a  -s ours

Change-Id: I990d6c6a3aa7ad0fd170ba2b2d0c8a7c75232fe7