tree 49697bf0f46ae1e82e604ad42c35f97074eebe2d
parent d41e52a238bdb91df5dffb81f202b3d50949bb9a
parent 5ec2ab68f98af7fcb4975bafcb7293f835c9c4b6
author Christopher Ferris <cferris@google.com> 1376009971 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376009971 -0700

am 5ec2ab68: am 21b4ffa7: (-s ours) am 5427eb5c: (-s ours) am e2066293: (-s ours) Merge "Optimize strcat/strcpy, small tweaks to strlen. DO NOT MERGE"

* commit '5ec2ab68f98af7fcb4975bafcb7293f835c9c4b6':