tree 15c4062bedb1b1ef1f533464a31c96979e0b6c3d
parent 2ee985913f4c7e082fc68e6896698d9fa117c474
parent 4ae94541b82dde787b0e2c46f1a4f2524572c1c4
author Elliott Hughes <enh@google.com> 1383846117 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383846117 -0800

am 4ae94541: am 62ea993a: Merge "Revert enabling libunwind."

* commit '4ae94541b82dde787b0e2c46f1a4f2524572c1c4':
  Revert enabling libunwind.