| commit | 35aa3642e1d4c6206750d5b51519d7de352a80e2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 22 15:40:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 22 15:40:06 2012 -0700 |
| tree | 6b8f99819ec9f84a5eedee7f3fd6b383f97960f0 | |
| parent | 548a5257e56d41e7332fcc116316b84c3fb7499d [diff] | |
| parent | bd82e3293c03f27d69af8c554fbcf4dcd2399b32 [diff] |
am bd82e329: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'bd82e3293c03f27d69af8c554fbcf4dcd2399b32': Revert "Upgrade to dlmalloc 2.8.5."