tree beecf7022d70b1fd2d5254ad8130218be776e331
parent 6dee3b9aeec40bb518c1a29b4462300869a03d8e
parent 3456a1f5f486ebca7389bfd3eb942cb107eee0e6
author Elliott Hughes <enh@google.com> 1380594182 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1380594182 +0000

Merge "Fix x86 build."