commit a07712c240c9f68eb31b526eb0fb2c4c966a05f1
author Torne (Richard Coles) <torne@google.com> Tue Jun 11 16:24:27 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Tue Jun 11 16:24:27 2013 +0100
tree 5855700eba9763a363fcce2177f410b036fc5d61
parent 23042b77ca894a768b5747ff08f587ed8222772a

Record Chromium merge at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: Ie78d4be2278c6a86859b4f92b065e718163e287e

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 6df93e2..7d5792c 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -3,3 +3,4 @@
 e52495584422c5edb5b2944981473a2e208da323 8521fccd3e39d65a1f2ac1f360f5ead86fcb7dae 1b63805cc7cabee60a8ad3cc04c11d1c4cd62f11
 93ac45cfc74041c8ae536ce58a9534d46db2024e 2fc993d4600e7917ccca616e2e62605780ceabb9 9b17ff297eef76e982063be22550b33577acf15c
 5267f701546148b83dfbe1d151cb184385bb5c22 849dee59310a97b012b82f8ce9840bc7b758f6fa 8113018a3a70ac9888d31a4efe4f8aff8f120cab
+23042b77ca894a768b5747ff08f587ed8222772a b2c7ed382aaed597b9c1bd443999c0b99a585d33 aff91eaaed5c1ab7b6584324906a815e68630cf1