summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-11-12 17:59:44 +0000
committerTorne (Richard Coles) <torne@google.com>2014-11-12 17:59:44 +0000
commitbe0db613a3916853a2abecc9b0bd869b7640022e (patch)
tree72abcc6524b0af46a35f95d3eae5cf4151a2538a
parent1850ca92fc5c5faa2907b3befcf40067265148cc (diff)
downloadchromium_org-be0db613a3916853a2abecc9b0bd869b7640022e.tar.gz
Record Chromium merge at DEPS revision 03655fd3f6d7
This commit was generated by merge_to_master.py. Change-Id: I20ffa2d5cf7c0e375ccbb65d99bb8a40a9504835
-rw-r--r--.merged-revisions1
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions
index a3cf44f88a..656c1a9913 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -56,3 +56,4 @@ f8ee788a64d60abd8f2d742a5fdedde054ecd910 fcbbbe23a38088a52492922075e71a419c4b01e
1320f92c476a1ad9d19dba2a48c72b75566198e9 39b78c562f50ad7d5551ee861121f899239525a2 168caa0d95f3c2c8b436a47dcb83bc8285a0a0fa
0b0f963dd8b51fbabf01fa148e5d3eff645300e7 12144dc038ba97fbfd95d7c49cccde498c42de8f 30f7ec3122630e460621125ed883a3685b212da7
31cddfd4ec55fcfc2129f5fbb6b805caa05239e6 d89a76b554c21870a46be512d079b41cf4aa1a6c bd5e037d1a39a2f732d56642ab984fbe5a649f7b
+1850ca92fc5c5faa2907b3befcf40067265148cc e9e1f6521e4fef99aa1a1928c70ef3dfb55a8d9e 531e2fb59ca4756625196ea5a989ccd3305d30a1