OSDN Git Service

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


Trivial merge