OSDN Git Service

am 6beb3ea6: (-s ours) am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcp...
authorChristopher Ferris <cferris@google.com>
Fri, 9 Aug 2013 00:53:19 +0000 (17:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Aug 2013 00:53:19 +0000 (17:53 -0700)
commit1036cd7939a4d6474d3f5762ea8bfdd95d3d0cfe
tree49697bf0f46ae1e82e604ad42c35f97074eebe2d
parent5ec2ab68f98af7fcb4975bafcb7293f835c9c4b6
parent6beb3ea6a1a49baef001ddd8c6872631f5e90f82
am 6beb3ea6: (-s ours) am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"

* commit '6beb3ea6a1a49baef001ddd8c6872631f5e90f82':
  Fix strcpy.c that should have been strcpy.S. DO NOT MERGE