ref: 66906da06698ffc4d12115d8b6a4be74097a2c5f
parent: 7ceddede063d79527c424e3823186bff5b2ccbd6
parent: 0928da3b6e6d804a1f16f35227cc4f771b9e8e88
author: Hui Su <huisu@google.com>
date: Thu Oct 30 07:02:31 EDT 2014
Merge "Combine vp9_encode_block_intra and encode_block_intra"