summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-03-18 10:21:02 +0000
committerTorne (Richard Coles) <torne@google.com>2014-03-18 10:21:02 +0000
commit6d6d338a36340632714f2aab9a266979b71c3442 (patch)
tree254156aa8b0d4188143d8fd2e78a1060a0db7015
parenta1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (diff)
downloadchromium_org-6d6d338a36340632714f2aab9a266979b71c3442.tar.gz
Record Chromium merge at DEPS revision 257591
This commit was generated by merge_to_master.py. Change-Id: Iff99a605ab8e02af4fc85e3ec6e7695b04505ae7
-rw-r--r--.merged-revisions1
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions
index 854971f9ea..b8581e8a37 100644
--- a/.merged-revisions
+++ b/.merged-revisions
@@ -33,3 +33,4 @@ d0247b1b59f9c528cb6df88b4f2b9afaf80d181e f7571f5f07547e2f3e0addf48d1f2a7ec363295
f2477e01787aa58f445919b809d89e252beef54f 7daea1dd5ff7e419322de831b642d81af3247912 f87cb9362be4f1beece1a7f0168d1f1201620544
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f 6a65302965bd54cdbd66ecfb059bce017b5ec754
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 e862bac9c33104a29d98631d62668ae7b6676510 6dbebe6ed42043ee4b6649da90eed75cbb7a98b1
+a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 af5066f1e36c6579e74752647e6c584438f80f94 ce02fa07806ddc7f7ca49897fb7c7c07a8afe98d