tree 75038f94f16e7156a8e17939c1aa1319b11cf686
parent b9dc0359dd9e50b4a44964382d87d773f79dbc81
parent 67922bb3ac780eda154b5f6201660633c56dce80
author Ian Rogers <irogers@google.com> 1400707676 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400707676 +0000

am 67922bb3: am 512d5393: Merge "Work around Mac assembler differences."

* commit '67922bb3ac780eda154b5f6201660633c56dce80':
  Work around Mac assembler differences.