commit 12144dc038ba97fbfd95d7c49cccde498c42de8f
author Primiano Tucci <primiano@google.com> Tue Sep 30 14:46:01 2014 +0100
committer Primiano Tucci <primiano@google.com> Tue Sep 30 14:46:01 2014 +0100
tree 69b0f58c05b26a2dd47e125ed64f02901bd97764
parent 1320f92c476a1ad9d19dba2a48c72b75566198e9

Record Chromium merge at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id061c24b6e79e34afde83e5fe7a9d2982e2fc79c

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index de90d32..6b96374 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -53,3 +53,4 @@
 5f1c94371a64b3196d4be9466099bb892df9b88e 43165a58c6167882aabb62f470c4e4d21f807d79 dff989219388a8bc27d59f6098a9e45d61fee2a4
 6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 4f7316adb45db5ec3c9c1181ba9510c004566df8 b3adc86740447e68401deb521f89cea0f6880b9e
 03b57e008b61dfcb1fbad3aea950ae0e001748b0 ca7d0c81aa30d24514c34c963f43cd24da34a2bf e39cdbbb05511221c3ceac1625b9867480a98ec1
+1320f92c476a1ad9d19dba2a48c72b75566198e9 39b78c562f50ad7d5551ee861121f899239525a2 168caa0d95f3c2c8b436a47dcb83bc8285a0a0fa