tree 8c70afd36a886901b094e83c721648527a0bcefe
parent 0f2160426d45e3577e3a3153b635f6168ec303fd
parent 82ccec4123c8ca8fb52036224f24f220857a6aca
author Andrew Hsieh <andrewhsieh@google.com> 1363963183 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1363963184 +0000

Merge "Fix compilation error by GCC 4.3.3"