tree fd0890c9cc91d0ce70dd03dce189c18c0bf6b5a5
parent c5f723aef55912545b3dc32983a58974c5193e5e
parent 011076b720b0809a6b94703780e768cd7b877c68
author Christopher Ferris <cferris@google.com> 1400696201 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400696201 +0000

am 011076b7: Merge "Support for jemalloc to replace dlmalloc."

* commit '011076b720b0809a6b94703780e768cd7b877c68':
  Support for jemalloc to replace dlmalloc.