summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorMike Reed <reed@google.com>2014-11-19 16:13:20 -0500
committerTom Hudson <tomhudson@google.com>2015-01-06 21:41:35 +0000
commit71487eb0ceb2b7dea02649e78d99bb5952f5eaef (patch)
tree05513c6b4fe8ccccc1b8e08e0aae9d5094dc40f1 /packages/SystemUI/res
parent2b2ad7ce9f008cc383394cc91389d667575ec45d (diff)
downloadframeworks_base-71487eb0ceb2b7dea02649e78d99bb5952f5eaef.zip
frameworks_base-71487eb0ceb2b7dea02649e78d99bb5952f5eaef.tar.gz
frameworks_base-71487eb0ceb2b7dea02649e78d99bb5952f5eaef.tar.bz2
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
Diffstat (limited to 'packages/SystemUI/res')
0 files changed, 0 insertions, 0 deletions