commit 9e75a9e8e78755bdac83500676c5d9a933921504
author Ben Murdoch <benm@google.com> Fri Jan 16 13:22:34 2015 +0000
committer Ben Murdoch <benm@google.com> Fri Jan 16 13:22:34 2015 +0000
tree 822071fce985694306c866bc3c406d788221d8bc
parent 2e473b9e39cddff89bc3b5dbc4b62c6443d140e0

Record Chromium merge at DEPS revision 40.0.2214.87

This commit was generated by merge_to_master.py.

Change-Id: I03d933f21afd72d5975ec6c494cee009b91f37fe

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 5585f08..7dfaf20 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -59,3 +59,4 @@
 89c67ddcc5facac418484cf5529e5e9ad57d6902 db158510a660b87dc1f8e778d9137ed81b0ccf80 817ef1692560311cabd7216cbad390f82176bb0c
 bbc94673cb67ec241a14093b662f45afed88ee1a a1c277b4ba5f16d867fe198d39a4991139d78f6f fc04b46a390d35fcf850563609d38b3fd52da64d
 dda3e71dfec2cee8b52aafff7db353bc1a8aa0f6 fdb9e630f6269d516d306945c53a1ad035dd2911 c51dda7029d7ec562d3caafcee88b47bd18c283d
+2e473b9e39cddff89bc3b5dbc4b62c6443d140e0 097478c1a38c1b7c44825045bf02f635e0948918 cd3498425a25bc6a7cb057ad90721d5f312346e6