Merge changes Ibb308526,I99e330f8
authorAlex Converse <aconverse@google.com>
Thu, 10 Sep 2015 23:04:46 +0000 (23:04 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 10 Sep 2015 23:04:46 +0000 (23:04 +0000)
* changes:
  Prevent CR in screen mode from refreshing flat inter blocks forever.
  For screen content consider intra uv when color_sensitivity is set.


Trivial merge