tree 50136329ead3f18165ec39b29ec974fe2d633f3a
parent 6458a6e945fd69ff3d6388e834bb3e43161cd5a5
parent 9b1cc92566cd6870f493b8044ad59951f46d4a74
author Ben Chan <benchan@chromium.org> 1403801263 -0700
committer Ben Chan <benchan@chromium.org> 1403801273 -0700

Merge branch 'merge-cromo-rewrite' into merge-cromo

BUG=chromium:370267

Change-Id: I090189be488624a3a6bcb4b85e119bdbdda5d998