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)
commit2be288ff70a54d330c12496958a42b6d9e52b51e
tree856a38c994359db726d211aa14a25cfdba4d4420
parentcc2706542fc0fb3b54c40e173e9d08d042571660
parent93a7186512494624b3eba9f0bbf395128c202178
Merge "Fix build after C++11 migration."