commit 239f71cccdd3c5b2f3c4304631d39b6111a2cb26
author Ben Murdoch <benm@google.com> Sat Nov 22 01:28:32 2014 +0000
committer Ben Murdoch <benm@google.com> Sat Nov 22 01:28:32 2014 +0000
tree 412583212c475b3c9a1f4c65ca2a56fd9ac90de6
parent e4256316f8b5e8d1ec0df1f7762771622a53fa63

Record Chromium merge at DEPS revision 39.0.2171.90

This commit was generated by merge_to_master.py.

Change-Id: Ia17c23f18c98496f73176f545e8331805640ccec

.merged-revisions

diff --git a/.merged-revisions b/.merged-revisions
index fbebf25..1692114 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -60,3 +60,4 @@
 ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 93b3e633be4a0f65c62fca1805fd44021e04beaa 2598d5754afbf4a2f49cc2f1112fd852f134eb09
 5b892326406927b709cdaf6c384d4ababf456332 17d46637767dc9c540d984794ad6b5162e8c8c4f 8a32c452aeddb84e63e3bb51872ccdde474e58a9
 29b820f8d84e3bc97d62552e54923c42407f2f29 42a0b512b27badd0d560042d40f00d2b782c416f 2015baafc843d6dced8cd095bc19cc73aa6a2a8b
+e4256316f8b5e8d1ec0df1f7762771622a53fa63 165c68f9802332588874b0a207d7f49d03009ddf 5795eff1d9382f7da7039188fe427fca2faab8d5