tree a05e5ea48ac8c1aa786785eb9e66936a6c6c46ba
parent 5bbf7d3a5e95aee83d842316fc651e53e1cef3ac
parent 7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef
author Christopher Ferris <cferris@google.com> 1389318866 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389318866 +0000

am 7a6e8c9a: am ec7894cf: am c369f199: am 6e257869: Merge "Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD."

* commit '7a6e8c9adcb7fa46a16fe930c1c81c94f2a0daef':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.