OSDN Git Service

am 994b68f5: resolved conflicts for merge of 6a51defa to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 30 Aug 2010 00:48:55 +0000 (17:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 30 Aug 2010 00:48:55 +0000 (17:48 -0700)
commitdb0017e5e2c167f6dfe0f95ad02063970d95e37d
tree002f4fdcff3be08c7a480d7a604e9f9d4fca84f3
parent67b2206bbd943cb5f5aefb72dc81c6a8cdd65bdb
parent994b68f5c7d637d2945c06260fe35b266c10379d
am 994b68f5: resolved conflicts for merge of 6a51defa to gingerbread-plus-aosp

Merge commit '994b68f5c7d637d2945c06260fe35b266c10379d'

* commit '994b68f5c7d637d2945c06260fe35b266c10379d':
  Fix __get_tls() in static C library to use kernel helpers.
libc/Android.mk