tree 50136329ead3f18165ec39b29ec974fe2d633f3a
parent 7b4349ba54a0eb46aa4a8e8eef94b18311655764
parent ce133c3d5f1b52e0c7f79775956d57cedeb215f6
author Ben Chan <benchan@chromium.org> 1404172868 -0700
committer Ben Chan <benchan@chromium.org> 1404172883 -0700

Merge branch 'merge-crash-reporter-rewrite' into merge-crash-reporter

BUG=chromium:370261

Change-Id: I53d6f5ad57d55bf467023856c26699c7231bf86c