commit 6a869ecff032b5bed299d661b078b0555034598b
author Torne (Richard Coles) <torne@google.com> Thu May 15 12:16:33 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Thu May 15 12:16:33 2014 +0100
tree 8305c13facd014749edf9a1f7094ea5117757a14
parent 0de6073388f4e2780db8536178b129cd8f6ab386

Record Chromium merge at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Ia54dac0ca1731464f335e65ec34cfe89ace7bde3

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 9ec17e9..bd11b62 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -43,3 +43,4 @@
 0529e5d033099cbfc42635f6f6183833b09dff6e 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca 493b0f9d7ff4bafb32633b979cda99708163926f
 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 56e9d6e218656f3d05620cc9877fd61482337fb1 18255a076079bd8c332ba17b4425fece8b2a6c27
 010d83a9304c5a91596085d917d248abff47903a 08c107de54178bb0990a09adec724924e8bc9486 2b822439a89697d04c2d3c7020c3cd9e3009e263
+0de6073388f4e2780db8536178b129cd8f6ab386 237b4e8281feb4bb44a23557a97fcbbd55133d68 00fcd757c52be64cfca97ecac63618e0d917440f