tree d493a5154385e67b2b7e086f90d71ddeeb430eb7
parent 61db21cef81cbc8439b34a8f1d32952339ffc190
parent da2f071483b148bba216d40070d87f92785b527f
author Dan Albert <danalbert@google.com> 1408745521 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408745521 +0000

am da2f0714: Merge "Fix x86 build for SSSE3."

* commit 'da2f071483b148bba216d40070d87f92785b527f':
  Fix x86 build for SSSE3.