| commit | 679093b8f9c5460cc32acec15563668300b00299 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Jun 07 17:21:22 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 07 17:21:22 2012 -0700 |
| tree | bfd50bf63f3d89f1da7f2952475efe39011c5016 | |
| parent | 0c3afa6fd3b1f6a541e7bdabcde121ff98851376 [diff] | |
| parent | 1316efa2d9a5d356c8890d34867776d944cc643c [diff] |
am 1316efa2: (-s ours) am 9b1d0758: Merge "Cherrypick change to skia" * commit '1316efa2d9a5d356c8890d34867776d944cc643c': Cherrypick change to skia