OSDN Git Service

Merge "Quick: Fix a DCHECK to take type conflicts into account."
authorAndreas Gampe <agampe@google.com>
Wed, 1 Jul 2015 05:17:24 +0000 (05:17 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 1 Jul 2015 05:17:24 +0000 (05:17 +0000)

Trivial merge