rebase
authorjoshualitt <joshualitt@chromium.org>
Thu, 18 Dec 2014 20:11:40 +0000 (12:11 -0800)
committerCommit bot <commit-bot@chromium.org>
Thu, 18 Dec 2014 20:11:41 +0000 (12:11 -0800)
commit695025fe1d638955d399cd8ff33f6fc7ca5e935e
tree2229d16bc7b0a13226f3d21efa7cef427b1735a6
parent341400ea7ba0f711ac4c6ead0b33c5c89b4ac55c
rebase
NOTRY=True
TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/798323006
30 files changed:
expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Debug/expected-results.json
expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Debug/expected-results.json
expectations/gm/Test-Android-Nexus10-MaliT604-Arm7-Release/expected-results.json
expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Debug/expected-results.json
expectations/gm/Test-Android-Nexus5-Adreno330-Arm7-Release/expected-results.json
expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-Release/expected-results.json
expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Debug/expected-results.json
expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Debug/expected-results.json
expectations/gm/Test-Android-Xoom-Tegra2-Arm7-Release/expected-results.json
expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
expectations/gm/Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
expectations/gm/Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Debug/expected-results.json
expectations/gm/Test-Mac10.8-MacMini4.1-GeForce320M-x86_64-Release/expected-results.json
expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Debug/expected-results.json
expectations/gm/Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release/expected-results.json
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Debug/expected-results.json
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86-Release/expected-results.json
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Debug/expected-results.json
expectations/gm/Test-Ubuntu12-ShuttleA-GTX660-x86_64-Release/expected-results.json
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE/expected-results.json
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Debug/expected-results.json
expectations/gm/Test-Win7-ShuttleA-HD2000-x86-Release-ANGLE/expected-results.json
expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Debug/expected-results.json
expectations/gm/Test-Win8-ShuttleA-HD7770-x86-Release/expected-results.json
expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Debug/expected-results.json
expectations/gm/Test-Win8-ShuttleA-HD7770-x86_64-Release/expected-results.json