diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-02-05 08:50:14 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-05 08:50:14 -0800 |
| commit | 2a95157fbba1f9645888ba260175926f41c310bf (patch) | |
| tree | d17ad402adaf1d6a21de1ca303ef27c97dbba80d /include | |
| parent | 1cc593f726932b7f147a132267128a2b6da50dfd (diff) | |
| parent | 58a011744d4ec233d80221c3c211854fa58435c4 (diff) | |
| download | external_skia-2a95157fbba1f9645888ba260175926f41c310bf.zip external_skia-2a95157fbba1f9645888ba260175926f41c310bf.tar.gz external_skia-2a95157fbba1f9645888ba260175926f41c310bf.tar.bz2 | |
am 58a01174: reconcile main tree with open-source eclair
Merge commit '58a011744d4ec233d80221c3c211854fa58435c4' into eclair-plus-aosp
* commit '58a011744d4ec233d80221c3c211854fa58435c4':
android-2.1_r1 snapshot
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions