tree 0ad85f1f8470352f0edfd686a232f14fe042f7d6
parent 72fbdba8e93b9bc28e0b000f8b8a54fe0ea3aaa4
parent 798695d5525bf9663e6f59764e5103e10e95b978
author David Pursehouse <dpursehouse@collab.net> 1502222878 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1502222878 +0000

Merge "Fix compilation error against current Gerrit master"