commit 4f7316adb45db5ec3c9c1181ba9510c004566df8
author Torne (Richard Coles) <torne@google.com> Tue Aug 12 13:47:45 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Aug 12 13:47:45 2014 +0100
tree ec6d8fed981edea165ddc93ebf052e94a2b89d41
parent 5f1c94371a64b3196d4be9466099bb892df9b88e

Record Chromium merge at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I69c1c98fd1de188e46d4a787df25cbb57e27bce7

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index eef4770..30d9330 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -50,3 +50,4 @@
 6d86b77056ed63eb6871182f42a9fd5f07550f90 e9f930807da3850e29ecc641d2becc0403b5709c 9f912606eff2ee7267bf965e32907428b147cb56
 4b40b0048fbed486657a92ccee9b4301b2f8c815 d5411d381bc538606761ef694b678b9b81f3532a 644aa49a9ef44cbc417967dfa75d5a5b584115eb
 116680a4aac90f2aa7413d9095a592090648e557 1f14a4515e04c9ffc9bac4dd1e2f68611626b800 7f33c37457f64575c2b2f0457fd575f11258b145
+5f1c94371a64b3196d4be9466099bb892df9b88e 43165a58c6167882aabb62f470c4e4d21f807d79 dff989219388a8bc27d59f6098a9e45d61fee2a4