Merge "Fix build after C++11 migration."
authorDan Albert <danalbert@google.com>
Tue, 25 Nov 2014 19:18:40 +0000 (19:18 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 25 Nov 2014 19:18:41 +0000 (19:18 +0000)

Trivial merge