tree 6323e46ca9ba03d26b4dceb1acf9c3b9dc0675cf
parent 143ad4cf31832537102ae8df7ad7360071b806af
parent 252a5c854a08e89fc7337ea679220161fe4ea98f
author Iliyan Malchev <malchev@google.com> 1338651307 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1338651307 -0700

am 252a5c85: resolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp

* commit '252a5c854a08e89fc7337ea679220161fe4ea98f':
  bionic: import heaptracker as chk_malloc