tree ce02e1600ad772511a3ebe809474b0c799bf3ab4
parent 0f14e8d5ea2cef28cfa0f39851ad55b134043e7d
parent c5cf53701a5e04aeead70b1298bb38c51633e96d
author Christopher Ferris <cferris@google.com> 1376590496 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376590496 -0700

am c5cf5370: (-s ours) Merge "Optimize __memset_chk, __memcpy_chk. DO NOT MERGE."

* commit 'c5cf53701a5e04aeead70b1298bb38c51633e96d':
  Optimize __memset_chk, __memcpy_chk. DO NOT MERGE.