OSDN Git Service

resolved conflicts for merge of 4a05d12c to eclair-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Tue, 22 Sep 2009 22:41:36 +0000 (15:41 -0700)
committerDavid 'Digit' Turner <digit@google.com>
Tue, 22 Sep 2009 22:41:36 +0000 (15:41 -0700)
commit7910e39d197bc32ed79a144d06279c2be3c7f296
tree2be732d00b499cd6d2e1be8084ba81730ca6c113
parent7ed086eb99a0dc326bf47fb387fa8be394fe3da4
parent4a05d12cf52a9a40759f11f28543bd75715c8f00
resolved conflicts for merge of 4a05d12c to eclair-plus-aosp
libc/private/bionic_tls.h