OSDN Git Service

Merge ""#warning" conflict with -Werror"
authorDan Stoza <stoza@google.com>
Thu, 3 Mar 2016 15:36:33 +0000 (15:36 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 3 Mar 2016 15:36:33 +0000 (15:36 +0000)

Trivial merge