| commit | c8d666176858f52a6e103f1a35c3235f14e9f079 | [log] [tgz] |
|---|---|---|
| author | jeffhao <jeffhao@google.com> | Wed Apr 04 11:28:38 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 04 11:28:38 2012 -0700 |
| tree | 51ed4268d8656f9764cd80d5370e203eb9eaec70 | |
| parent | eff161d7b92ded05dc56f102cf0e819f2ce510e6 [diff] | |
| parent | 9abca492f4630ffbe89498bf73bf89f943753ed6 [diff] |
am 9abca492: Merge "Fix method tracing and allow alloc counting during tracing." into ics-mr1-plus-art * commit '9abca492f4630ffbe89498bf73bf89f943753ed6': Fix method tracing and allow alloc counting during tracing.