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)
commit3c092e2474fdcef4c9d5383d5a1fe8e8db676e5b
tree03b20acd17258a0b768ba2c89e19190e94b98454
parentb50e0badbcbbe618a184e90006207e067cc71429
parent3d6b8a667f67b6c0f0689cb45a48b8510a64e0ce
Merge changes Ibb308526,I99e330f8

* changes:
  Prevent CR in screen mode from refreshing flat inter blocks forever.
  For screen content consider intra uv when color_sensitivity is set.