]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/platform-bionic.git/commitdiff
Merge commit 'remotes/korg/cupcake'
authorJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 15:57:30 +0000 (07:57 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 19 Dec 2008 15:57:30 +0000 (07:57 -0800)
Conflicts:
libc/include/dirent.h


Trivial merge