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)
* commit 'd7d5049d58427e23318fa1920d63712676fc7725':
  Fix strcpy.c that should have been strcpy.S. DO NOT MERGE


Trivial merge