commit 7f0cef9354df60453dbb3170eb28a7ee5bbcf077
author Torne (Richard Coles) <torne@google.com> Tue Oct 22 16:41:53 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Oct 22 16:41:53 2013 +0100
tree f920dc6d9b1e70defc7565055547a2a1c114b012
parent bfe3590b1806e3ff18f46ee3af5d4b83078f305a

Record Chromium merge at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I1bc4ed19a4bce5e4bddd8d75bd25d26a28d8d4a1

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 7757876..f57359c 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -25,3 +25,4 @@
 9bbd2f5e390b01907d97ecffde80aa1b06113aac 7351f7fa4c898c0b87277d9b641210245e5f7f42 45b1ece42d14109ec87884fcfd670c72fae24880
 06f816c7c76bc45a15e452ade8a34e8af077693e 36811536b9bd86e7f1d045052a5b0551fa48ac9f 165e764396c9ba0991566f4921407a21d66e07ba
 1e202183a5dc46166763171984b285173f8585e5 2c9d3f38c113c1e8767ec34552f06c92def51abe 38c124d74acd595f3562b21799f29e1f8ff09b23
+bfe3590b1806e3ff18f46ee3af5d4b83078f305a 9402e5a409a9456b6d38bc45e6a6983af4bfcd42 05fef2eb2e46fe7b63f012c98353946c9a7e6610