tree 05c518a72f20d5b4f635009b1486267ca0341535
parent 579c7bcca5c39a4b5499fd4ea5f90ef1e43ecdbb
author hkuang <hkuang@google.com> 1404331709 -0700
committer hkuang <hkuang@google.com> 1404338259 -0700

Revert "Revert "Revert "Revert 3 patches from Hangyu to get Chrome to build:"""

This reverts commit 749e0c7b2883139afa14b4886bbd6a940d021f4f.

Change-Id: I0c63a152baf94d38496dd925a40040366153bf4f