summaryrefslogtreecommitdiffstats
path: root/libc
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:44:18 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:44:18 -0800
commit1db874720a58ff7e3684116d59ad08bc73db26d9 (patch)
treeb83ab9148375acd52e67693bd2fd010a8aab0760 /libc
parentc0472409d14eebf797df962dd78fc31afbc4bd07 (diff)
parentba8bfedd04824eea944236ffc885f866c5e9c651 (diff)
downloadbionic-1db874720a58ff7e3684116d59ad08bc73db26d9.zip
bionic-1db874720a58ff7e3684116d59ad08bc73db26d9.tar.gz
bionic-1db874720a58ff7e3684116d59ad08bc73db26d9.tar.bz2
am ba8bfedd: reconcile main tree with open-source eclair
Merge commit 'ba8bfedd04824eea944236ffc885f866c5e9c651' into eclair-plus-aosp * commit 'ba8bfedd04824eea944236ffc885f866c5e9c651': android-2.1_r1 snapshot
Diffstat (limited to 'libc')
0 files changed, 0 insertions, 0 deletions