f53ff623fa912118774098be4dd1dbbd340dda37 - platform/external/skia

commit	f53ff623fa912118774098be4dd1dbbd340dda37	[log] [tgz]
author	joshualitt <joshualitt@chromium.org>	Sat Dec 20 10:30:09 2014 -0800
committer	Commit bot <commit-bot@chromium.org>	Sat Dec 20 10:30:09 2014 -0800
tree	253190d8a724f1512da86ee52b90e0d1c650c1b7
parent	752e7eb157f8a18c26b88b7b85eecdbd5549d52e [diff]

rebase coloremoji

NOTRY=True
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/822553002

expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json[diff]
expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json[diff]
expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json[diff]
expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json[diff]
expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json[diff]
expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json[diff]
expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Debug/expected-results.json[diff]
expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json[diff]
expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json[diff]
expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json[diff]
expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/expected-results.json[diff]
expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Release/expected-results.json[diff]
expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json[diff]
expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Debug/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Alex-GMA3150-x86-Release/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Debug/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Daisy-MaliT604-Arm7-Release/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-ChromeOS-Link-HD4000-x86_64-Release/expected-results.json[diff]
expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json[diff]
expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json[diff]
expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json[diff]
expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json[diff]
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json[diff]
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json[diff]
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json[diff]
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json[diff]
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json[diff]
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json[diff]
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release/expected-results.json[diff]
expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json[diff]
expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json[diff]
expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json[diff]
expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json[diff]
expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json[diff]
expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json[diff]
expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json[diff]
expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json[diff]
expectations/gm/ignored-tests.txt[diff]

47 files changed