diff options
author | Wei-Ta Chen <weita@google.com> | 2009-11-16 10:43:48 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-16 10:43:48 -0800 |
commit | d3b8e237aaf15dbd5d9790d339688e5f1012f841 (patch) | |
tree | 563507c03fbcfc0ff4862324c28b656217da6da7 /tests | |
parent | f943c71dd4ecd215aa62c99555827957c11b9269 (diff) | |
parent | f6422563280a45dbee99f03a4f23da4cdd4ba910 (diff) | |
download | external_skia-d3b8e237aaf15dbd5d9790d339688e5f1012f841.zip external_skia-d3b8e237aaf15dbd5d9790d339688e5f1012f841.tar.gz external_skia-d3b8e237aaf15dbd5d9790d339688e5f1012f841.tar.bz2 |
am f6422563: (-s ours) Do not merge.
Merge commit 'f6422563280a45dbee99f03a4f23da4cdd4ba910' into eclair-mr2
* commit 'f6422563280a45dbee99f03a4f23da4cdd4ba910':
Do not merge.
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions