summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-12-04 19:18:42 +0000
committerBen Murdoch <benm@google.com>2014-12-04 19:18:42 +0000
commit9ee52bce72cd41a1b4dc6465e17465c50ca50210 (patch)
tree524c8548e53bb165c4aacf7e6f2ce59ec05e8329
parent9b7530fe12b3ab334030489c5909884a43ec0e0c (diff)
downloadchromium_org-9ee52bce72cd41a1b4dc6465e17465c50ca50210.tar.gz
Record Chromium merge at DEPS revision 40.0.2214.27
This commit was generated by merge_to_master.py. Change-Id: I0e2e23d382a87a1164d585e21d064f6dd8c7f77a
-rw-r--r--.merged-revisions1
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions
index 8445eb2d94..bb26a642a9 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -58,3 +58,4 @@ f8ee788a64d60abd8f2d742a5fdedde054ecd910 fcbbbe23a38088a52492922075e71a419c4b01e
31cddfd4ec55fcfc2129f5fbb6b805caa05239e6 d89a76b554c21870a46be512d079b41cf4aa1a6c bd5e037d1a39a2f732d56642ab984fbe5a649f7b
1850ca92fc5c5faa2907b3befcf40067265148cc e9e1f6521e4fef99aa1a1928c70ef3dfb55a8d9e 531e2fb59ca4756625196ea5a989ccd3305d30a1
7f11db722e2af5d4e21e711545372830ca4221d4 be0db613a3916853a2abecc9b0bd869b7640022e c6675c16bd3c18f95c755b29535cf74e8961254d
+9b7530fe12b3ab334030489c5909884a43ec0e0c b3ba26a3ba6ae102935279aae006d296c372b98e 9201141c3476d8670cd6145e70319e5091ebf406