summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-06-03 10:58:43 +0100
committerTorne (Richard Coles) <torne@google.com>2014-06-03 10:58:43 +0100
commit7ef4c70daab901f557268ad466f62cd2f7896916 (patch)
treee33df455f296d75dae8c0d6c4fd4adc06037e001
parentcedac228d2dd51db4b79ea1e72c7f249408ee061 (diff)
downloadchromium_org-7ef4c70daab901f557268ad466f62cd2f7896916.tar.gz
Record Chromium merge at DEPS revision 273901
This commit was generated by merge_to_master.py. Change-Id: Ib458e3529c563112182d0de32f82bd7cf99d15d9
-rw-r--r--.merged-revisions1
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions
index bd11b625ba..96cb7e8e33 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -44,3 +44,4 @@ a02191e04bc25c4935f804f2c080ae28663d096d 8bad47e0f7d0c250a0443923cceb52f4a4abcd4
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 56e9d6e218656f3d05620cc9877fd61482337fb1 18255a076079bd8c332ba17b4425fece8b2a6c27
010d83a9304c5a91596085d917d248abff47903a 08c107de54178bb0990a09adec724924e8bc9486 2b822439a89697d04c2d3c7020c3cd9e3009e263
0de6073388f4e2780db8536178b129cd8f6ab386 237b4e8281feb4bb44a23557a97fcbbd55133d68 00fcd757c52be64cfca97ecac63618e0d917440f
+cedac228d2dd51db4b79ea1e72c7f249408ee061 6a869ecff032b5bed299d661b078b0555034598b 7787c9c4d4155f293aa320b4a0385d92d48b9581