tree 68b426388adc78040949e65282fd623d08b7644d
parent 2651d6c6cbd0fafff83aafb61ab7bc9cbab413d2
parent c37dcd3d3ab8e32c37ce034b8d1772b4a7b9add9
author Brian Carlstrom <bdc@google.com> 1345505388 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345505388 -0700

am c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."

* commit 'c37dcd3d3ab8e32c37ce034b8d1772b4a7b9add9':
  Upgrade to dlmalloc 2.8.5.