OSDN Git Service

Merge "Fix C++14 bitrot."
authorDan Albert <danalbert@google.com>
Fri, 7 Aug 2015 23:21:25 +0000 (23:21 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 7 Aug 2015 23:21:25 +0000 (23:21 +0000)

Trivial merge