Merge "create vp10_arg_ctrl_map"
authorHui Su <huisu@google.com>
Tue, 18 Aug 2015 00:49:24 +0000 (00:49 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 18 Aug 2015 00:49:24 +0000 (00:49 +0000)

Trivial merge