commit aca6628925558d3ddd5c7c3b35f961fc33265bb1
author Ben Murdoch <benm@google.com> Fri Jan 16 13:22:21 2015 +0000
committer Ben Murdoch <benm@google.com> Fri Jan 16 13:22:21 2015 +0000
tree 49fd8b449c54cc8191dc2c9ef3f6e99784060ad6
parent 9b5f223a42843fd55515fbbb5cc7f5da9a86bcec

Record Chromium merge at DEPS revision 40.0.2214.87

This commit was generated by merge_to_master.py.

Change-Id: I01bbd0eb75057d0f3be881ab85a6ed78b6db8957

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index ffb6e7c..1eb016a 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -62,3 +62,4 @@
 499b68b2a50f97e14f9b5a94ba3a91dafb161934 9ee52bce72cd41a1b4dc6465e17465c50ca50210 9f713e707478a5762366a506982097348dda4c5a
 f98d056c47cd300cdf14b9f21fcd4982517f5576 6b5044c3c31708eab28967cc213c002aaca9a4e1 2281b441c26cb82d9ed4cab1a842dcf1fc94691b
 157b5147234887e6ae1d2ac178c8f7f660b47991 52d30f09348f225515c287af61b1db5ea90275bb 43e17f47eca2ada3d7563c065cb1bd1e936d89c5
+9b5f223a42843fd55515fbbb5cc7f5da9a86bcec b670521b4618e57d71ffbd88c95afe00692c437e 093029e80271a8b9f2a207d571ae1b06cb7e7a21