| author | The Android Open Source Project <initial-contribution@android.com> | |
| Wed, 22 Aug 2012 22:35:50 +0000 (15:35 -0700) | ||
| committer | Android Git Automerger <android-git-automerger@android.com> | |
| Wed, 22 Aug 2012 22:35:50 +0000 (15:35 -0700) | ||
| commit | e2862bb984ab7f5a57391b6ad5a633135adb094a | |
| tree | f2d036d256a8c586eb2d50c9e5b6d04bc8f9cd26 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 2bdfdfbf091d826721951e4e495e7e41b7b0d777 | commit | diff |
| parent | b1d43872224837a85f593d9f946686c7272c7d0e | commit | diff |
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"
* commit 'b1d43872224837a85f593d9f946686c7272c7d0e':
Revert "Upgrade to dlmalloc 2.8.5."
Revert "Restore posix_memalign"