tree e99c8c3f84ab0f206829b12665c4bb1304542bf5
parent fde641ee24b7a0a5d1fb6e2532153f1bb8504aea
parent 62ea993a6997701dba7735ca4a4af6fc6cabac2c
author Elliott Hughes <enh@google.com> 1383843680 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383843680 -0800

am 62ea993a: Merge "Revert enabling libunwind."

* commit '62ea993a6997701dba7735ca4a4af6fc6cabac2c':
  Revert enabling libunwind.