| commit | 6beb3ea6a1a49baef001ddd8c6872631f5e90f82 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Thu Aug 08 17:45:45 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 08 17:45:45 2013 -0700 |
| tree | 022e75cb0f579eee1de36da9d9044967a617242c | |
| parent | 21b4ffa7372b029e5a4898b877feb843da2831e9 [diff] | |
| parent | d7d5049d58427e23318fa1920d63712676fc7725 [diff] |
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