tree 983d9a4cdc2c122c7e1aab741802cfb89615e60d
parent 480fdd524da3aa24429e46b81f52651f95c1c59a
parent 525155ac49bae98e9f50ce667609c32eeccc80be
author Elliott Hughes <enh@google.com> 1391206168 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391206168 +0000

am 525155ac: Merge "Allow the host libcorkscrew to build."

* commit '525155ac49bae98e9f50ce667609c32eeccc80be':
  Allow the host libcorkscrew to build.