commit 90c5e8db1ae573cced24aec444504b908bc6f9e3
author Ben Murdoch <benm@google.com> Thu Dec 11 12:27:45 2014 +0000
committer Ben Murdoch <benm@google.com> Thu Dec 11 12:27:45 2014 +0000
tree ff5ec9eb64fa4a6b70d6d3c173e4dac753f57c38
parent 499b68b2a50f97e14f9b5a94ba3a91dafb161934

Record Chromium merge at DEPS revision 40.0.2214.38

This commit was generated by merge_to_master.py.

Change-Id: I165dbde319035d47019f02e67b77123965430fb0

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index bb26a64..d3c3e41 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -59,3 +59,4 @@
 1850ca92fc5c5faa2907b3befcf40067265148cc e9e1f6521e4fef99aa1a1928c70ef3dfb55a8d9e 531e2fb59ca4756625196ea5a989ccd3305d30a1
 7f11db722e2af5d4e21e711545372830ca4221d4 be0db613a3916853a2abecc9b0bd869b7640022e c6675c16bd3c18f95c755b29535cf74e8961254d
 9b7530fe12b3ab334030489c5909884a43ec0e0c b3ba26a3ba6ae102935279aae006d296c372b98e 9201141c3476d8670cd6145e70319e5091ebf406
+499b68b2a50f97e14f9b5a94ba3a91dafb161934 9ee52bce72cd41a1b4dc6465e17465c50ca50210 9f713e707478a5762366a506982097348dda4c5a