| commit | 31431f454a9d3d3dde46de0e3c39cc409a39c436 | [log] [tgz] |
|---|---|---|
| author | Iliyan Malchev <malchev@google.com> | Sat Jun 02 08:35:07 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jun 02 08:35:07 2012 -0700 |
| tree | 6323e46ca9ba03d26b4dceb1acf9c3b9dc0675cf | |
| parent | 143ad4cf31832537102ae8df7ad7360071b806af [diff] | |
| parent | 252a5c854a08e89fc7337ea679220161fe4ea98f [diff] |
am 252a5c85: resolved conflicts for merge of e1dd3c28 to jb-dev-plus-aosp * commit '252a5c854a08e89fc7337ea679220161fe4ea98f': bionic: import heaptracker as chk_malloc