rebase
authorjoshualitt <joshualitt@chromium.org>
Thu, 18 Dec 2014 19:00:51 +0000 (11:00 -0800)
committerCommit bot <commit-bot@chromium.org>
Thu, 18 Dec 2014 19:00:52 +0000 (11:00 -0800)
commitccd552b00734c4f9884af3b8c66205fb9172a792
tree0aa5f709275ad496437d4a02ead2c3ea74c44338
parent309d4d590964fbf7443c5bc892c132faa61a9abb
rebase

TBR=
NOTRY=True
BUG=skia:

Review URL: https://codereview.chromium.org/812423002
expectations/gm/Test-Android-GalaxyS4-SGX544-Arm7-Release/expected-results.json
expectations/gm/Test-Android-Nexus9-TegraK1-Arm64-Release/expected-results.json
expectations/gm/Test-Android-NexusPlayer-PowerVR-x86-Debug/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-Win7-ShuttleA-HD2000-x86_64-Debug/expected-results.json
expectations/gm/Test-Win7-ShuttleA-HD2000-x86_64-Release/expected-results.json
expectations/gm/ignored-tests.txt