| commit | d1e01f5b49115470c77f7e3bfc969bd8b51f1391 | [log] [tgz] |
|---|---|---|
| author | Derek Sollenberger <djsollen@google.com> | Wed Aug 24 11:17:52 2011 -0400 |
| committer | Derek Sollenberger <djsollen@google.com> | Wed Aug 24 11:17:52 2011 -0400 |
| tree | 716fb8899766e76d368d146d5ff6978f7f44ee28 | |
| parent | 00f5211d7b9f51a97a806c584b773555ed39bf3a [diff] |
Merge upstream bug fixes from Skia into Android. This CL pulls in r1835 and r1870 from Skia's trunk. bug: 5197241 Change-Id: I79b51cf8605bc16641cfe7b3e1b369f801bf0922