tree 1beb97cb943610e95d206eb5b8258d4e678d4c9f
parent df3da5a71c1ce1b2b82615baf934c2b14534f81a
parent 3cf91d84d7965117b1fc20ca19653bfaea62114f
author Kristian Monsen <kristianm@google.com> 1393357269 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1393357269 +0000

Merge "Revert "Fix multi-arch build for x86""