Merge "Fix error in get_smooth_intra_threshold() for 10/12 bit."
authorPaul Wilkins <paulwilkins@google.com>
Thu, 30 Jun 2016 16:25:54 +0000 (16:25 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 30 Jun 2016 16:25:55 +0000 (16:25 +0000)

Trivial merge