rebase
authorjoshualitt <joshualitt@chromium.org>
Wed, 12 Nov 2014 13:44:24 +0000 (05:44 -0800)
committerCommit bot <commit-bot@chromium.org>
Wed, 12 Nov 2014 13:44:25 +0000 (05:44 -0800)
commitb103d0c64ae837ac1b6006b952e29347d8377490
tree9ca6010798453dfd5c09aa5345e73e6544aa9dda
parenta3d33c546f8a9037c6138acc8dfe68452459efde
rebase

TBR=
BUG=skia:

Review URL: https://codereview.chromium.org/717033002
20 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-Debug/expected-results.json
expectations/gm/Test-Android-Nexus7-Tegra3-Arm7-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-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-Release/expected-results.json
expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Debug/expected-results.json
expectations/gm/Test-Win8-ShuttleA-GTX660-x86-Release/expected-results.json
expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Debug/expected-results.json
expectations/gm/Test-Win8-ShuttleA-GTX660-x86_64-Release/expected-results.json
expectations/gm/ignored-tests.txt