commit 237b4e8281feb4bb44a23557a97fcbbd55133d68
author Torne (Richard Coles) <torne@google.com> Wed May 14 12:12:41 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 14 12:12:41 2014 +0100
tree 15a6caf4cad031833352a2306549f8699f949fbf
parent 010d83a9304c5a91596085d917d248abff47903a

Record Chromium merge at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: Ib93a52e6d88bd64d802b3215bc21cd13dd477ef1

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 640eecb..9ec17e9 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -42,3 +42,4 @@
 a02191e04bc25c4935f804f2c080ae28663d096d 8bad47e0f7d0c250a0443923cceb52f4a4abcd40 db4dc4968d9f8ddc6c025c5b5a615d0b03306e3e
 0529e5d033099cbfc42635f6f6183833b09dff6e 8346740f6fb555ccbb9b4148ab63402ae8f6e4ca 493b0f9d7ff4bafb32633b979cda99708163926f
 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 56e9d6e218656f3d05620cc9877fd61482337fb1 18255a076079bd8c332ba17b4425fece8b2a6c27
+010d83a9304c5a91596085d917d248abff47903a 08c107de54178bb0990a09adec724924e8bc9486 2b822439a89697d04c2d3c7020c3cd9e3009e263