OSDN Git Service

Merge "media: -Werror re-enabled"
authorMark Salyzyn <salyzyn@google.com>
Tue, 15 Apr 2014 22:31:39 +0000 (22:31 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 15 Apr 2014 22:31:39 +0000 (22:31 +0000)

Trivial merge