OSDN Git Service

am 2b252dc1: Merge "Quick: Fix a DCHECK to take type conflicts into account."
authorAndreas Gampe <agampe@google.com>
Wed, 1 Jul 2015 05:30:34 +0000 (05:30 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 1 Jul 2015 05:30:34 +0000 (05:30 +0000)
* commit '2b252dc15995a708aead33aab6d307205d860a88':
  Quick: Fix a DCHECK to take type conflicts into account.


Trivial merge