tree fcf787dd087cfeaf16aefa2b84a80547ccba9f7d
parent 27710fa87cc7fc0f205a6b5a46f418a0cf9a5171
parent 8f1a4d4e92e9572dc1b5eaf33f03d390c4ff801a
author Nicolas Geoffray <ngeoffray@google.com> 1400230091 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1400230091 +0000

Merge "Workaround for multi-line comment error when compiled with g++."