tree 64bf1bec88b95ee116188e054a5447bb95d60ba9
parent 3df76c0c738e0205cf287dbdf6ebe3b75d765b87
parent a345b25371aa49ebaa4f3b36bb664ba4cf600e60
author Elliott Hughes <enh@google.com> 1388705613 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388705613 +0000

am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit 'a345b25371aa49ebaa4f3b36bb664ba4cf600e60':
  Switch ARM back to libcorkscrew temporarily.