tree 50136329ead3f18165ec39b29ec974fe2d633f3a
parent e5dd3bb84ba430ec538a94b2a86153a7903e783b
parent f28a106a839b803c97cbc7ee7d1293d7641dafe3
author Ben Chan <benchan@chromium.org> 1404262480 -0700
committer Ben Chan <benchan@chromium.org> 1404262495 -0700

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

BUG=chromium:388278

Change-Id: Ia640dbfa5aa7928df205d676571eaee461bbc544