tree 85aa0a98229f371399382e152fe4c92db6ad2f02
parent 1bceafbeac74ed56b3140679b5db97737a75d4ac
parent d817560c697508df0d941071c8e96152c9404def
author Roland Levillain <rpl@google.com> 1453804040 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1453804040 +0000

Merge "Fix non-Linux builds."