tree 900e34de0153ad4b1b99e4c687b61e32246d97a0
parent 471fb5beb826a8dead12600bffb8729a9ced9c47
parent b7346d5f936f74a2c320b57c6a9c539d0fb0cc85
author Nicolas Geoffray <ngeoffray@google.com> 1450395522 +0000
committer android-build-merger <android-build-merger@google.com> 1450395522 +0000

Merge "Change DCHECK into CHECK to diagnose sporadic crash." am: 2dbab9548b
am: b7346d5f93

* commit 'b7346d5f936f74a2c320b57c6a9c539d0fb0cc85':
  Change DCHECK into CHECK to diagnose sporadic crash.