tree 9ad854667484453c1364cfdd7ddf2fe8ff29dfc0
parent c49bd655e5233f367c535ed4324bbadc4aea5453
parent c369f1993b41dac8ac1a005b3bc9312dfa5ebd63
author Christopher Ferris <cferris@google.com> 1389312293 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389312293 +0000

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

* commit 'c369f1993b41dac8ac1a005b3bc9312dfa5ebd63':
  Move BACKTRACE_NO_TID to BACKTRACE_CURRENT_THREAD.