tree 2a8e7e1865db28d0498c8ed2c50ec2a1f47384bc
parent 9492b6e72cef71422ba624e3cd11f07156cfb34a
parent be18538d4373364b6c9b1149a24974976169f52f
author Elliott Hughes <enh@google.com> 1381426423 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381426423 -0700

am be18538d: Merge "Cleanup x86 flags and memset versions"

* commit 'be18538d4373364b6c9b1149a24974976169f52f':
  Cleanup x86 flags and memset versions