tree ca4713a139d5e3ff94dfd1ed267c2cb09f6b5219
parent 6439e3e534d174ee99d2fe6f508dacff53afb86c
parent 08b004c9938a06bea32288a4b4e40127887ff682
author Kristian Monsen <kristianm@google.com> 1393344460 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1393344460 +0000

Merge "Fix multi-arch build for x86"