tree c70f291bd8a0a7a304ff4650571842c2ba6e3fbb
parent 5dadac50c4bbeaf8baf4d5e04c2d2706d9e74fc7
parent 98f87d92d89079f274374409efcf57ca52b13c1f
author Christopher Ferris <cferris@google.com> 1383078306 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1383078306 -0700

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

* commit '98f87d92d89079f274374409efcf57ca52b13c1f':
  Rewrite libbacktrace using C++.