tree a7bbbcbf2e0b51e6a6c69efad1a8367e9c25ca37
parent 30dddd6f49b04ac5160c1de702cafe09b42ce1d1
parent 7bd45d0010622e559f7795243ec8e548f641266b
author Riley Andrews <riandrews@google.com> 1439423480 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439423480 +0000

am 7bd45d00: am 4997a57a: Merge "Tracing for binder locks/transactions"

* commit '7bd45d0010622e559f7795243ec8e548f641266b':
  Tracing for binder locks/transactions