Merge "Strip redundant entries from .mailmap"
authorJohann Koenig <johannkoenig@chromium.org>
Mon, 7 Dec 2015 18:14:05 +0000 (18:14 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 7 Dec 2015 18:14:05 +0000 (18:14 +0000)

Trivial merge