tree 977134e8630564a3bdf8df24c2c41a74532f0c90
parent c2902edfc4aaa02977eef7154d05d5369bc48281
parent 061246b600c16a80b246804221b9e3fa65e507d9
author Rom Lemarchand <romlem@google.com> 1374612749 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374612749 -0700

am 061246b6: Merge "Restore dlmalloc mmap threshold to 64k"

* commit '061246b600c16a80b246804221b9e3fa65e507d9':
  Restore dlmalloc mmap threshold to 64k