tree ca356c5e00ef324f99136e9737b1009e530d9206
parent e721327ee78fa819a0f208b0c4cdbc1776627dfa
parent 3a9c7161dfd6f16baddd2eb209a013609b927da7
author Jeff Hao <jeffhao@google.com> 1377897447 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377897447 -0700

am 3a9c7161: am 6627e5b2: Merge "Change IsMethodTracingActive to GetMethodTracingMode for frameworks." into klp-dev

* commit '3a9c7161dfd6f16baddd2eb209a013609b927da7':
  Change IsMethodTracingActive to GetMethodTracingMode for frameworks.