commit 97ac789233983599db098915255d22efab32bc6e
author Ben Murdoch <benm@google.com> Mon Dec 08 16:38:49 2014 +0000
committer Ben Murdoch <benm@google.com> Mon Dec 08 16:38:49 2014 +0000
tree f4dc636bfba0122c0326cbe1f24a6f646a0950da
parent c697e19c7f0752eb71ac656d8e15df48c0141365

Record Chromium merge at DEPS revision 39.0.2171.95

This commit was generated by merge_to_master.py.

Change-Id: If9e1a173e63867dad1c8c1e9a10a9a8427850cdd

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index 04ee52d..c95af55 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -58,3 +58,4 @@
 f542a0e9557608d421c9d165487573efa35a5f91 28cfbf09145941b4f9a047523e24093167ce4491 1f5435ff821046f593d811f1a86e523834ba1fdf
 a372c30a9dc26aa32e51fa7b85e0c47b55479f89 9e4f975de7fe39810c2fe4299e8e34ec54d9bcf2 ebce7a93d30e324a30c64fed331579b1725d04f9
 018c2aa55614eda57c6617f8d0747eacefc389a3 042939c159e27d08cc39001e3990ccb318513dd6 9946b88e4b0f26a8f3535beddb7f582cf9f4e328
+c697e19c7f0752eb71ac656d8e15df48c0141365 33319092ecf4672ece92dc98f9b12e1f3e196c44 c83a882450e8dfcce07741c2e8c6f2214ea858f1