tree 31c5f0a6aca5f664ec10fc15fe4cb3cd8d384365
parent c1d5ffe349b9dc8d19e1cf2bff3f9c050e8cb93e
parent 5ee9d98349b5ea14c06eb83ed8a9f5ffe0ab314d
author Ben Cheng <bccheng@google.com> 1363031535 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1363031535 +0000

Merge "Quick fix for the x86 build."