tree a40dee8f733b55ecd17c1f152ee9307565293fe7
parent efdad1f40070d09979b7d14c7f8453343581665c
author hui su <huisu@google.com> 1494980344 -0700
committer Hui Su <huisu@google.com> 1495044553 +0000

Fix conflicts between alt-intra, ext-intra and filter-intra

Change-Id: I18dc1acf25977b42b2bba73eab00b461a66c49b6