tree f3894a7ba669d73e354274b30c8a61115dc60209
parent 1269ff961000c726247d510762e42b21562b8c2b
parent 7ff53fa0d42795da55b65468e07df82029deda79
author Elliott Hughes <enh@google.com> 1423201053 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1423201053 +0000

Merge "Fix clang build."