Merge "Fix a bug in intra prediction due to change in 25e55526301eba7d6e5c68e25402e9b...
authorhkuang <hkuang@google.com>
Wed, 26 Feb 2014 19:56:45 +0000 (11:56 -0800)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 26 Feb 2014 19:56:45 +0000 (11:56 -0800)

Trivial merge