tree ebdc7654e609f6d0e175d997bab4403a95d751e6
parent 9262e5fdcd77e296bd71dbc1c9448a347a851789
parent 506d233e7ac8ca4efa80768153d842c296477f99
author Josh Gao <jmgao@google.com> 1453747842 +0000
committer android-build-merger <android-build-merger@google.com> 1453747842 +0000

Merge "Use dlmalloc from external/dlmalloc instead of bionic/."
am: 506d233e7a

* commit '506d233e7ac8ca4efa80768153d842c296477f99':
  Use dlmalloc from external/dlmalloc instead of bionic/.