tree 242e469d00e058d2c29376e7aa7b715dd1cf0da3
parent 5d2ec87bf54dc8a02e6bcbe5848fd378056b8f78
parent 6e25786914d5f8c50040471c8b1a950d2efb32a1
author Christopher Ferris <cferris@google.com> 1389312141 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389312141 -0800

am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."

* commit '6e25786914d5f8c50040471c8b1a950d2efb32a1':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.