commit 15fa748eb859077205cfb7614ebb2dfd076d4f7e
author Torne (Richard Coles) <torne@google.com> Wed Nov 06 12:27:49 2013 +0000
committer Torne (Richard Coles) <torne@google.com> Wed Nov 06 12:27:49 2013 +0000
tree 4511e1cefe6a6739ddaff76e72b2baa0666f35c4
parent 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740

Record Chromium merge at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I52cd5b8bc1f6e6fa0dc3d267bdcc9a286a92bb79

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 051c040..f48efe2 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -29,3 +29,4 @@
 4e180b6a0b4720a9b8e9e959a882386f690f08ff 1179b92b08db0c652a0cf003ab4d89b31ce3610f aa18863ee34b554b323df3b65528cb0280ee55ce
 8bcbed890bc3ce4d7a057a8f32cab53fa534672e 116fa16b45c9efe30e785b9fc32f09780ca23bec 1953f92ed4cccc8b84eceb012b7a0334f38eb521
 1e9bf3e0803691d0a228da41fc608347b6db4340 f10b58d5bc6ae3e74076fc4ccca14cbc57ef805c 53122a89e25cb9c95f25044e113b51050dba0368
+0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 0bdaf95291fc46702f274f40e8e5081e9ef23011 d52f33b82573afcbccd9c5607e889e3235fcf32f