tree 6c61a6cda8c84a11ec03e52ca9c9ecaa37d193c6
parent 88d040a32feac727a7e11658198c32d9cc563d8e
parent 090928b11b02d4a724f90eca65346918c44b144c
author Elliott Hughes <enh@google.com> 1388705783 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388705783 +0000

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

* commit '090928b11b02d4a724f90eca65346918c44b144c':
  Switch ARM back to libcorkscrew temporarily.