tree 3375ede5eb1d34d9da1b9eaf99d29cf26396506a
parent 13802114b8683a097fbecd42a1a07d39619a8a4e
parent 13e2fdfa8c689a3f6e3fc5d2c8c3cea9c85c0387
author Brian Carlstrom <bdc@google.com> 1347492947 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347492947 -0700

am 13e2fdfa: am b73232f0: Merge "Disable x86 assembly on darwin"

* commit '13e2fdfa8c689a3f6e3fc5d2c8c3cea9c85c0387':
  Disable x86 assembly on darwin