ref: 715b8d3befdd24b81a564b819fc18f95296b24f1
parent: 0e79906dc0ddc7b70ac2d46cae791a4d8de21653
parent: 749e0c7b2883139afa14b4886bbd6a940d021f4f
author: James Zern <jzern@google.com>
date: Fri Jun 27 16:53:57 EDT 2014
Merge "Revert "Revert "Revert 3 patches from Hangyu to get Chrome to build:"""