diff options
| author | Ben Murdoch <benm@google.com> | 2015-01-08 11:32:58 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2015-01-08 11:32:58 +0000 |
| commit | b670521b4618e57d71ffbd88c95afe00692c437e (patch) | |
| tree | fd9e3b5925de41f916fa47b7b93820fc3de9026e | |
| parent | 157b5147234887e6ae1d2ac178c8f7f660b47991 (diff) | |
| download | chromium_org-b670521b4618e57d71ffbd88c95afe00692c437e.tar.gz | |
Record Chromium merge at DEPS revision 40.0.2214.69
This commit was generated by merge_to_master.py.
Change-Id: I17568cc6fef7aca9b56cba2b193feacc604444ba
| -rw-r--r-- | .merged-revisions | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.merged-revisions b/.merged-revisions index edf630f03b..ffb6e7c103 100644 --- a/.merged-revisions +++ b/.merged-revisions @@ -61,3 +61,4 @@ f8ee788a64d60abd8f2d742a5fdedde054ecd910 fcbbbe23a38088a52492922075e71a419c4b01e 9b7530fe12b3ab334030489c5909884a43ec0e0c b3ba26a3ba6ae102935279aae006d296c372b98e 9201141c3476d8670cd6145e70319e5091ebf406 499b68b2a50f97e14f9b5a94ba3a91dafb161934 9ee52bce72cd41a1b4dc6465e17465c50ca50210 9f713e707478a5762366a506982097348dda4c5a f98d056c47cd300cdf14b9f21fcd4982517f5576 6b5044c3c31708eab28967cc213c002aaca9a4e1 2281b441c26cb82d9ed4cab1a842dcf1fc94691b +157b5147234887e6ae1d2ac178c8f7f660b47991 52d30f09348f225515c287af61b1db5ea90275bb 43e17f47eca2ada3d7563c065cb1bd1e936d89c5 |