Merge "Modifies inter/intra coding to allow all tx types"
authorDebargha Mukherjee <debargha@google.com>
Fri, 8 Jan 2016 20:02:41 +0000 (20:02 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 8 Jan 2016 20:02:41 +0000 (20:02 +0000)

Trivial merge