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)
commitbd9f81765ba3e30b1037ad27d7ea47f9dbd7a1fc
tree6bc853b650f428b636f25594a6917d42cba1f86a
parent73512b66ccbcb6abbd20993e1bd6128bc530f90e
parent2b252dc15995a708aead33aab6d307205d860a88
am 2b252dc1: Merge "Quick: Fix a DCHECK to take type conflicts into account."

* commit '2b252dc15995a708aead33aab6d307205d860a88':
  Quick: Fix a DCHECK to take type conflicts into account.