OSDN Git Service

am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should have...
authorChristopher Ferris <cferris@google.com>
Fri, 9 Aug 2013 00:45:45 +0000 (17:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 9 Aug 2013 00:45:45 +0000 (17:45 -0700)
commit6beb3ea6a1a49baef001ddd8c6872631f5e90f82
tree022e75cb0f579eee1de36da9d9044967a617242c
parent21b4ffa7372b029e5a4898b877feb843da2831e9
parentd7d5049d58427e23318fa1920d63712676fc7725
am d7d5049d: (-s ours) am 632fd518: (-s ours) Merge "Fix strcpy.c that should have been strcpy.S. DO NOT MERGE"

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