tree 20cc987690dd6a0cd265f9a1976538744429f7d9
parent dd0e991c6a0d4d71f1698fd57608a7d42401b6da
parent fe87596a5ba5a5b0773b2854f9fce85f49367611
author Brian Carlstrom <bdc@google.com> 1345505489 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345505489 -0700

am fe87596a: am c37dcd3d: Merge "Upgrade to dlmalloc 2.8.5."

* commit 'fe87596a5ba5a5b0773b2854f9fce85f49367611':
  Upgrade to dlmalloc 2.8.5.