tree f59dddd4ed54555a55a6ab075f80912af5aef893
parent f84f7fa4d280e02c5cfc5730c64693f3e20eb5c5
parent 5baecee3c6bf348b77b8785bcd8e35362a3507fb
author Elliott Hughes <enh@google.com> 1381426810 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381426810 -0700

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

* commit '5baecee3c6bf348b77b8785bcd8e35362a3507fb':
  Cleanup x86 flags and memset versions