commit 257f9d82311b125eb71816076cdcb07be40dd3b2
author Torne (Richard Coles) <torne@google.com> Fri Sep 19 12:02:39 2014 +0100
committer Torne (Richard Coles) <torne@google.com> Fri Sep 19 12:02:39 2014 +0100
tree 36e53b451433ac1503020ae2e2c85338e6c6e144
parent 21a33e99a57b647a2fc21a938f2d8d15d2945a93

Record Chromium merge at DEPS revision 38.0.2125.69

This commit was generated by merge_to_master.py.

Change-Id: I607d23d763c85ecb3e6ff24647fa40a5068c2348

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 9a4f104..befc527 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -54,3 +54,4 @@
 6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 4f7316adb45db5ec3c9c1181ba9510c004566df8 f58ab9e279bc2cf551480c6d502cfba1f5cae308
 f7ee355ed2561fedcd0e7b298de85903154969e9 5b5755f51e60c56f517a0665801546a32e59d3f8 2cd21fe75c4d0dd1fb29449571557f5d0d38fc76
 03be8d5218e732394a6e42c57cc7c12588da3fa0 7e059cd366764f33d7cc86e290609a74b115403e c190e8b42f79d2162f68dfe336d3b38c81399ba6
+21a33e99a57b647a2fc21a938f2d8d15d2945a93 ce087a03836c21202ee565ab0427f57c17da1c35 8a01dc8c382223bd4867ace29fdf8e6885627f08