am 2fa4b0ce: (-s ours) am 7bd45d00: am 4997a57a: Merge "Tracing for binder locks/transactions"

* commit '2fa4b0ce3b94c4a15aad5d8dafc494e990d0edc2':