tree 8cfeabfcb774668d655eeacd29f083832291449a
parent 37cc29e95684de126693f59e91703b2af57e7659
parent c3d04aab960c81a746579d67a17049d8f4efba9a
author Elliott Hughes <enh@google.com> 1382643421 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382643421 -0700

am c3d04aab: am 4d87e743: Merge "Eliminate text relocations in x86 optimized memset versions"

* commit 'c3d04aab960c81a746579d67a17049d8f4efba9a':
  Eliminate text relocations in x86 optimized memset versions