tree 57d8b462b6aba361e2d8692f96d8e2407acb1368
parent b1bfa7956c56c28b8c914e6606df191e094e7b42
parent 0dcf06f976670b5d05286b184d150f61b71c1184
author Torne (Richard Coles) <torne@google.com> 1398164482 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1398164482 +0000

Merge "Fix arm64/x86 build."