| commit | 471d6d8b11e63af883bb3e11524f81d3dbd90029 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jun 22 14:32:49 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 22 14:32:49 2012 -0700 |
| tree | c8bd7e63fc184882a5d845cc72056434d609252c | |
| parent | e7145cfa30ed066921473528b6a7f575ec5f20ac [diff] | |
| parent | 4a65f812373e1ecfa6e7058d635e998429a4cf17 [diff] |
am 4a65f812: am 6e587f53: Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI" * commit '4a65f812373e1ecfa6e7058d635e998429a4cf17': Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI