Cherry pick fix for skbug.com/5734 to M54

Cherry pick fix for skbug.com/5734 to M54

BUG=skia:5734, 644753
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2316153002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Committed: https://skia.googlesource.com/skia/+/5f3cf1efbe4ccfe9b154e350aac59d0c87030358

[robertphillips, 2016-09-07 13:30:23]

Description was changed from

==========
Cherry pick fix for skbug.com/5734 to M54

BUG=skia:
==========

to

==========
Cherry pick fix for skbug.com/5734 to M54

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2316153002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

[robertphillips, 2016-09-07 13:31:44]

Description was changed from

==========
Cherry pick fix for skbug.com/5734 to M54

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2316153002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

to

==========
Cherry pick fix for skbug.com/5734 to M54

BUG=skia:5734
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2316153002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

[robertphillips, 2016-09-07 13:31:44]

robertphillips@google.com changed reviewers:
+ bsalomon@google.com

[bsalomon, 2016-09-07 13:32:36]

lgtm

[robertphillips, 2016-09-07 15:47:23]

Description was changed from

==========
Cherry pick fix for skbug.com/5734 to M54

BUG=skia:5734
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2316153002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

to

==========
Cherry pick fix for skbug.com/5734 to M54

BUG=skia:5734,644753
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2316153002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

[robertphillips, 2016-09-13 00:05:13]

The CQ bit was checked by robertphillips@google.com

[commit-bot: I haz the power, 2016-09-13 00:05:25]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-09-13 00:05:36]

Description was changed from

==========
Cherry pick fix for skbug.com/5734 to M54

BUG=skia:5734,644753
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2316153002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true
==========

to

==========
Cherry pick fix for skbug.com/5734 to M54

BUG=skia:5734,644753
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2316153002
NOTREECHECKS=true
NOTRY=true
NOPRESUBMIT=true

Committed:
https://skia.googlesource.com/skia/+/5f3cf1efbe4ccfe9b154e350aac59d0c87030358
==========

[commit-bot: I haz the power, 2016-09-13 00:05:37]

Committed patchset #2 (id:20001) as
https://skia.googlesource.com/skia/+/5f3cf1efbe4ccfe9b154e350aac59d0c87030358