Merge "Use canonical avg_pred functions"
authorJohann Koenig <johannkoenig@chromium.org>
Mon, 9 May 2016 18:38:12 +0000 (18:38 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 9 May 2016 18:38:12 +0000 (18:38 +0000)

Trivial merge