commit e862bac9c33104a29d98631d62668ae7b6676510
author Torne (Richard Coles) <torne@google.com> Wed Dec 18 16:25:13 2013 +0000
committer Torne (Richard Coles) <torne@google.com> Wed Dec 18 16:25:13 2013 +0000
tree 853b56fb0dd7a838e728e8cdddfb71206b4b5d05
parent a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7

Record Chromium merge at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I866540864a5aa4c8494282158f5e9a762dc58427

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 829a7b7..df38b86 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -31,3 +31,4 @@
 1e9bf3e0803691d0a228da41fc608347b6db4340 f10b58d5bc6ae3e74076fc4ccca14cbc57ef805c 53122a89e25cb9c95f25044e113b51050dba0368
 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 0bdaf95291fc46702f274f40e8e5081e9ef23011 d52f33b82573afcbccd9c5607e889e3235fcf32f
 f2477e01787aa58f445919b809d89e252beef54f 7daea1dd5ff7e419322de831b642d81af3247912 f87cb9362be4f1beece1a7f0168d1f1201620544
+a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f 6a65302965bd54cdbd66ecfb059bce017b5ec754