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