| commit | 71487eb0ceb2b7dea02649e78d99bb5952f5eaef | [log] [tgz] |
|---|---|---|
| author | Mike Reed <[email protected]> | Wed Nov 19 16:13:20 2014 -0500 |
| committer | Tom Hudson <[email protected]> | Tue Jan 06 21:41:35 2015 +0000 |
| tree | 05513c6b4fe8ccccc1b8e08e0aae9d5094dc40f1 | |
| parent | 2b2ad7ce9f008cc383394cc91389d667575ec45d [diff] |
Merge frameworks/base changes from master-skia to master. Adaptations to changes in Skia upstream since Oct 2014. (https://code.google.com/p/skia/issues/detail?id=2377) cbb922d use new roundOut signature 77082de Call SkColorTable::readColors(). 5456ab1 Handle the result of SkMatrix::asAffine. 25cfc78 Remove dependence on SK_LEGACY_PICTURE_SIZE_API. BUG:18468293 Change-Id: I5a4d274e854298843891410b1ffd5e24f038b88a