tree 2f490cdedceeaea199e2e7a571afe017d27b7d35
parent cb1f0147d729d1a3e9b4898ea98de3e6761233e4
parent 3e30f6afa042f3bba4822dc5d1ef267ed4b9d722
author Elliott Hughes <enh@google.com> 1388705978 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388705978 +0000

am 3e30f6af: am 090928b1: am a345b253: am dfc48139: Merge "Switch ARM back to libcorkscrew temporarily."

* commit '3e30f6afa042f3bba4822dc5d1ef267ed4b9d722':
  Switch ARM back to libcorkscrew temporarily.