am 82775ae0: resolved conflicts for merge of 347db52a to gingerbread-plus-aosp

Merge commit '82775ae0acf7cac647c057c80fbcc7f13d0554d3'

* commit '82775ae0acf7cac647c057c80fbcc7f13d0554d3':
  Update ATOM string routines to latest
This commit is contained in:
Jean-Baptiste Queru
2010-10-16 09:43:33 -07:00
committed by Android Git Automerger
10 changed files with 567 additions and 92 deletions

View File

@@ -405,7 +405,7 @@ libc_common_src_files += \
arch-x86/string/memset_wrapper.S \
arch-x86/string/strcmp_wrapper.S \
arch-x86/string/strncmp_wrapper.S \
arch-x86/string/strlen.S \
arch-x86/string/strlen_wrapper.S \
bionic/pthread-atfork.c \
bionic/pthread-rwlocks.c \
bionic/pthread-timers.c \