| commit | f80283087bec6da336da7e3a87baea1add8a4419 | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Tue Mar 24 19:26:52 2015 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Tue Mar 24 19:26:52 2015 +0000 |
| tree | ebebc32985c17391440bd890185eb148ad7dbc4f | |
| parent | 0f3201ec20d7c029ff91e13dc5c142e12062729f [diff] | |
| parent | 15bfd075d38e4422a477e22940d06a137f66cc97 [diff] |
Merge "Enabling ico decoding with use of png and bmp decoders" into master-skia https://skia.googlesource.com/skia/+/15bfd075d38e4422a477e22940d06a137f66cc97 Change-Id: I512fa5396792052c43ffb12a0b2d865fe7f14a31