summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-11-12 02:35:52 +0000
committerBen Murdoch <benm@google.com>2014-11-12 02:35:52 +0000
commit53975c7d18295b06744d5736517e1e06ba607193 (patch)
tree9325ef5ce77cfdedbf1920dfb6db2c31e7c95df6
parent29b820f8d84e3bc97d62552e54923c42407f2f29 (diff)
downloadchromium_org-53975c7d18295b06744d5736517e1e06ba607193.tar.gz
Record Chromium merge at DEPS revision 39.0.2171.59
This commit was generated by merge_to_master.py. Change-Id: Icdd8bd8652dd63d1358a2022e1567051d48f760e
-rw-r--r--.merged-revisions1
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions
index 71963eef9c..fbebf25dae 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -59,3 +59,4 @@ f8ee788a64d60abd8f2d742a5fdedde054ecd910 fcbbbe23a38088a52492922075e71a419c4b01e
5b62eb5758cb7b791cfdd45cf78f35dc060631b6 3d8539bb3dadb0bc7acda8488b3d2105f47e5966 2805c0b45c8fd36afb36d285acdf962033cab5ae
ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 93b3e633be4a0f65c62fca1805fd44021e04beaa 2598d5754afbf4a2f49cc2f1112fd852f134eb09
5b892326406927b709cdaf6c384d4ababf456332 17d46637767dc9c540d984794ad6b5162e8c8c4f 8a32c452aeddb84e63e3bb51872ccdde474e58a9
+29b820f8d84e3bc97d62552e54923c42407f2f29 42a0b512b27badd0d560042d40f00d2b782c416f 2015baafc843d6dced8cd095bc19cc73aa6a2a8b