tree cfed974be5625b326bceed10af35bf46c7aada19
parent b04b6c23589f20f915e70cbbb41bd42dd31127e9
parent 2f0f5ffcfcbe05d0fa20592294e6a12959e3dada
author Richard Uhler <ruhler@google.com> 1454454848 +0000
committer android-build-merger <android-build-merger@google.com> 1454454848 +0000

Merge "Fix DCHECK compilation error."
am: 2f0f5ffcfc

* commit '2f0f5ffcfcbe05d0fa20592294e6a12959e3dada':
  Fix DCHECK compilation error.