tree 6047492e6c3440d63400b97e49ecee7f8a0f8b1b
parent 0877965170498b2dd3a58f9483cf26d6945c9138
parent 70dc3e1d3d58647a7c9e4173d7a7fefd28ad81e3
author Jean-Baptiste Queru <jbq@google.com> 1340398039 -0700
committer android code review <noreply-gerritcodereview@google.com> 1340398039 -0700

Merge "Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI"