commit | e03efcb05f46ba8ce6c562b4a1c4822a8ebc0839 | [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 | d08803fa763a334a664a7e73241db8405213441b | |
parent | b0ca8b9dfd1a9dbd1fef2b44968c08c85771061f [diff] | |
parent | 2d7d3f78c90734c8067ab76b8f5daca84a311c92 [diff] |
am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia" * commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92': Adapt to latest skia