diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 14:19:50 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 14:19:50 -0800 |
| commit | 6fb02c1f75ab969890012dd1f01939d3444ddbc1 (patch) | |
| tree | 0fb281d1f2c9b5983c59359c272e6eb8cf4826b5 /include | |
| parent | 3b2114508894965a5145c2453601438b3700862e (diff) | |
| parent | 7b1211d28fc02f0fd24a9febeaae1e58da764f31 (diff) | |
| download | android_external_freetype-6fb02c1f75ab969890012dd1f01939d3444ddbc1.tar.gz android_external_freetype-6fb02c1f75ab969890012dd1f01939d3444ddbc1.tar.bz2 android_external_freetype-6fb02c1f75ab969890012dd1f01939d3444ddbc1.zip | |
am 7b1211d2: am 07007660: reconcile main tree with open-source eclair
Merge commit '7b1211d28fc02f0fd24a9febeaae1e58da764f31'
* commit '7b1211d28fc02f0fd24a9febeaae1e58da764f31':
android-2.1_r1 snapshot
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions