tree 87e6f760f5ce74830f6aad9cf389e60c065c78b8
parent e499f8a75c6c9632f5b1f1921e9471d52348e2f4
parent 0d1652e1e3768b30e4d80f31d59db580312581d8
author Nicolas Geoffray <ngeoffray@google.com> 1433330345 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1433330346 +0000

Merge "Fix compilation errors with gcc."