tree 8a2fb249127badb633082a4130ed832af56bf9c8
parent c7642c3239ea489c0c73b89a89de5f36fea31762
parent a9f933e53a6f4cf6152b0525cfafc602e5c3798f
author TreeHugger Robot <treehugger-gerrit@google.com> 1493852227 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1493852236 +0000

Merge changes from topic 'allow_none_scorer' into oc-dev

* changes:
  Revert permission check on setActiveScorer.
  Allow the active scorer to be set to NULL.