Merge "Fix a typo in ctrl_set_render_size()"
authorYaowu Xu <yaowu@google.com>
Thu, 21 Jan 2016 20:06:29 +0000 (20:06 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 21 Jan 2016 20:06:29 +0000 (20:06 +0000)

Trivial merge