tree e4178201ad6b1e7671a4f9391609926e28a9040f
parent 9531174d21b643d846a8bd5bdf72e59fd7830f30
parent 0ce3a783d549d023ddc553a04fed717ffb2ff533
author Christopher Ferris <cferris@google.com> 1414470661 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414470661 +0000

am 0ce3a783: Merge "Indicate this uses dlmalloc."

* commit '0ce3a783d549d023ddc553a04fed717ffb2ff533':
  Indicate this uses dlmalloc.