am b1d43872: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'b1d43872224837a85f593d9f946686c7272c7d0e':
  Revert "Upgrade to dlmalloc 2.8.5."
  Revert "Restore posix_memalign"
This commit is contained in:
The Android Open Source Project 2012-08-22 15:35:50 -07:00 committed by Android Git Automerger
commit e2862bb984

Diff Content Not Available