commit 84f2b2352908c30e40ae12ffe850dd8470f6c048
author Torne (Richard Coles) <torne@google.com> Tue Jun 11 16:24:12 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Jun 11 16:24:12 2013 +0100
tree 3983b6511b01ef7e36c85287ee01ea600f1dd1d0
parent 5e3f23d412006dc4db4e659864679f29341e113f

Record Chromium merge at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I83f440c9788338a2b95dad07ebdd232c86e9e839

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 2001948..f1c473e 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -3,3 +3,4 @@
 a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 770489ea635fbf896c1ace4db0d08d6981a2db8b 9f085d7e85987837baafaadf73f00eb6c9ca915c
 90dce4d38c5ff5333bea97d859d4e484e27edf0c 1515035f5917d10d363b0888a3615d581ad8b83f 1f1df7845db003c0469ba138540e6b877853e42a
 868fa2fe829687343ffae624259930155e16dbd8 bb1bdbd796f966b5bf11f40ecbea12621c7bfac9 22b0d041a5011708fc48a0f6dc100582675ba9e6
+5e3f23d412006dc4db4e659864679f29341e113f a486f6ca78e90d14f48125ef943e045218aac565 b58e9496f2bb903bebafd2f9789e43f58dc2da44