summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2014-12-04 10:54:06 +0000
committerBen Murdoch <benm@google.com>2014-12-04 10:54:06 +0000
commit175bb269aa5dd0c25f1d897ee8809a95e1bbbd49 (patch)
tree3141050bc6378393ef2da8c23e9d70fbad6ab0a6
parentf453b36b86edd15382a7e4da454f6bb02a848b5c (diff)
downloadchromium_org-175bb269aa5dd0c25f1d897ee8809a95e1bbbd49.tar.gz
Record Chromium merge at DEPS revision 39.0.2171.93
This commit was generated by merge_to_master.py. Change-Id: If5c41c8901c327e0abeb154e756e609eec2d8c0d
-rw-r--r--.merged-revisions1
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions
index 1692114317..a00e81c7fb 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -61,3 +61,4 @@ ab8f6f0bd665d3c1ff476eb06c58c42630e462d4 93b3e633be4a0f65c62fca1805fd44021e04bea
5b892326406927b709cdaf6c384d4ababf456332 17d46637767dc9c540d984794ad6b5162e8c8c4f 8a32c452aeddb84e63e3bb51872ccdde474e58a9
29b820f8d84e3bc97d62552e54923c42407f2f29 42a0b512b27badd0d560042d40f00d2b782c416f 2015baafc843d6dced8cd095bc19cc73aa6a2a8b
e4256316f8b5e8d1ec0df1f7762771622a53fa63 165c68f9802332588874b0a207d7f49d03009ddf 5795eff1d9382f7da7039188fe427fca2faab8d5
+f453b36b86edd15382a7e4da454f6bb02a848b5c 930af317ad725fdc2a512aa7ddacfb8e33a74763 bd22a6ee54fb97d0d36a45e8a8120415347a8616