commit 987ed41a0300b6c8d05f91872879ae8a5bd8e7a8
author Torne (Richard Coles) <torne@google.com> Mon Feb 09 10:52:51 2015 +0000
committer Torne (Richard Coles) <torne@google.com> Mon Feb 09 10:52:51 2015 +0000
tree 8da2265996d11960c42dfa977741c12739f12d2b
parent 3d920bbbe184a4e397234c7fb33d9d5f1040dc8f

Record Chromium merge at DEPS revision 40.0.2214.114

This commit was generated by merge_to_master.py.

Change-Id: Ic0e198aac86698d4a8ace9068cbbaede72a0fa22

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 66e7caf..e2aee3d 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -62,3 +62,4 @@
 2e473b9e39cddff89bc3b5dbc4b62c6443d140e0 097478c1a38c1b7c44825045bf02f635e0948918 cd3498425a25bc6a7cb057ad90721d5f312346e6
 ec3f91c2254a4a87db039560486ad2cd1c24cd5a 9e75a9e8e78755bdac83500676c5d9a933921504 55853ee1cec3fd97a73955bafe02bc24fd046a61
 55f653529432df63e7ee547545d92551c283ac0f 2d50636ba2727b3fb1fb2357fad512d293e307c5 e454debdd1276690a4bd8f63ccb3807de323a679
+3d920bbbe184a4e397234c7fb33d9d5f1040dc8f 06454d4e6794cee8d5b29d15a75cd6342372d2ba 5c7589bdbe6878566f5ea7171d640153c924cd9e