tree 2687164006da210498f7788029dcaacc070ccd82
parent 406abdc8a2b68df77ab30836826f642c2ef37bda
parent 0f26808e2c696f8bdcca644e0ddae2af9f753ada
author Christopher Ferris <cferris@google.com> 1383078474 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383078474 -0700

am 0f26808e: am 98f87d92: Merge "Rewrite libbacktrace using C++."

* commit '0f26808e2c696f8bdcca644e0ddae2af9f753ada':
  Rewrite libbacktrace using C++.