commit 52d30f09348f225515c287af61b1db5ea90275bb
author Torne (Richard Coles) <torne@google.com> Thu Dec 18 15:59:19 2014 +0000
committer Torne (Richard Coles) <torne@google.com> Thu Dec 18 15:59:19 2014 +0000
tree c08262b2d82388c371c302634c790d7ee43a250d
parent f98d056c47cd300cdf14b9f21fcd4982517f5576

Record Chromium merge at DEPS revision 40.0.2214.45

This commit was generated by merge_to_master.py.

Change-Id: I133d9df2c75ea608f1bcd57c6705ee329e7d742e

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index d3c3e41..edf630f 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -60,3 +60,4 @@
 7f11db722e2af5d4e21e711545372830ca4221d4 be0db613a3916853a2abecc9b0bd869b7640022e c6675c16bd3c18f95c755b29535cf74e8961254d
 9b7530fe12b3ab334030489c5909884a43ec0e0c b3ba26a3ba6ae102935279aae006d296c372b98e 9201141c3476d8670cd6145e70319e5091ebf406
 499b68b2a50f97e14f9b5a94ba3a91dafb161934 9ee52bce72cd41a1b4dc6465e17465c50ca50210 9f713e707478a5762366a506982097348dda4c5a
+f98d056c47cd300cdf14b9f21fcd4982517f5576 6b5044c3c31708eab28967cc213c002aaca9a4e1 2281b441c26cb82d9ed4cab1a842dcf1fc94691b