| commit | 194cda3d98715f519c824b81957cffa8bb89897e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu May 12 15:54:13 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 12 15:54:13 2011 -0700 |
| tree | 1ec4d75712b4d17a995a065d2afe558b9ecd444c | |
| parent | 38b210943c0f701539c487aec1802a80d2dea430 [diff] | |
| parent | d6c51aef6b8903ee2d9db3d1ed9f8736844e5201 [diff] |
am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia" * commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92': Adapt to latest skia