tree acff88398e92c067f53fe182c91d3523a9900b7c
parent 3010061a534805e8766e6eb207f7de99aae09b5f
parent 5630e54c3b1a90ee741bbcff129d0c711160ba02
author Nick Kralevich <nnk@google.com> 1369958521 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1369958521 -0700

am 5630e54c: am d515f468: Merge "libc x86: Remove strcat.S"

* commit '5630e54c3b1a90ee741bbcff129d0c711160ba02':
  libc x86: Remove strcat.S