commit 43ab914cefb14f341e8864e4c8c55a15a4bb35af
author Torne (Richard Coles) <torne@google.com> Tue Aug 12 13:48:12 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Aug 12 13:48:12 2014 +0100
tree 67369fe46766b02b927913ea7ef2d4cb8afac48d
parent c1847b1379d12d0e05df27436bf19a9b1bf12dea

Record Chromium merge at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: Idfd8fca036fa0fed471b9d746a93340ddb8b87a9

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index c6e8306..02c77de 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -47,3 +47,4 @@
 5d92fedcae5e801a8b224de090094f2d9df0b54a 86f30ce244d49e207344aea72c4f638d65e265c6 f188ef593e76295fe56387445e03253ac88c473a
 76c265b59aa821ccbf8c75ab2bb0d036e97d2956 8859235c09fcb949d8de54979117afda04164969 975555878d0578cf2fa97a5e0b8560aa31622037
 197021e6b966cfb06891637935ef33fff06433d1 379a09538d1ce0d7041096c03982927025ebcc40 be78305868ebf0c8d0659ffa4c69ac04d38365e9
+c1847b1379d12d0e05df27436bf19a9b1bf12dea a25b4978c2c50d573391a6d56a0e8ad35f52ffc8 12d25c91a039316e9f5f2d0fd5d1ca8fbcb394bd