Merge "Fix a build break due to a change in libui"
authorDan Stoza <stoza@google.com>
Mon, 8 Dec 2014 20:23:34 +0000 (20:23 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Mon, 8 Dec 2014 20:23:35 +0000 (20:23 +0000)

Trivial merge