summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-04-24 10:50:16 +0100
committerBen Murdoch <benm@google.com>2014-04-24 10:50:16 +0100
commit56e9d6e218656f3d05620cc9877fd61482337fb1 (patch)
treec7b78a5b8fa91d556057d4c440775b48f908b217
parent0529e5d033099cbfc42635f6f6183833b09dff6e (diff)
downloadchromium_org-56e9d6e218656f3d05620cc9877fd61482337fb1.tar.gz
Record Chromium merge at DEPS revision 265802
This commit was generated by merge_to_master.py. Change-Id: Icb0aebd0dc2404f267828aed562eadc42abec196
-rw-r--r--.merged-revisions1
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions
index dc6ff54382..39e2b27131 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -40,3 +40,4 @@ effb81e5f8246d0db0270817048dc992db66e9fb 4d26337013537c1acafbcb63b9b2b7e404c3adc
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 67e8dac6e410a019f58fc452b262a184e8e7fd12 210ffc32b496da71fe2e4977a76f1bcb2ccd2368
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 54cd42278ccf1d52996034848086a09b23065a40 a70c73b8ac0d1667347d67ff5182bbd2a9e0a62a
a02191e04bc25c4935f804f2c080ae28663d096d 8bad47e0f7d0c250a0443923cceb52f4a4abcd40 db4dc4968d9f8ddc6c025c5b5a615d0b03306e3e
+0529e5d033099cbfc42635f6f6183833b09dff6e 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca 493b0f9d7ff4bafb32633b979cda99708163926f