summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-02-05 08:47:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-02-05 08:47:07 -0800
commit7b1211d28fc02f0fd24a9febeaae1e58da764f31 (patch)
tree0fb281d1f2c9b5983c59359c272e6eb8cf4826b5
parent757b902d7fc0be2f82815d0846c12a1e66030bf4 (diff)
parent070076603b2f7e260e2f198695432dbd9bcce5d9 (diff)
downloadandroid_external_freetype-7b1211d28fc02f0fd24a9febeaae1e58da764f31.tar.gz
android_external_freetype-7b1211d28fc02f0fd24a9febeaae1e58da764f31.tar.bz2
android_external_freetype-7b1211d28fc02f0fd24a9febeaae1e58da764f31.zip
am 07007660: reconcile main tree with open-source eclair
Merge commit '070076603b2f7e260e2f198695432dbd9bcce5d9' into eclair-plus-aosp * commit '070076603b2f7e260e2f198695432dbd9bcce5d9': android-2.1_r1 snapshot
0 files changed, 0 insertions, 0 deletions