tree 6a9846314994f6a4987a5670f04bea2a27b84c89
parent aea165cb03abceb85062e94f22f72e1c9d9800a4
parent 0975a5d9d29019e764dc0ab2ddc75759bebffb9b
author Elliott Hughes <enh@google.com> 1428091922 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1428091922 +0000

Merge "Fix clang build."