diff options
| author |  yang-g <yangg@google.com> | 2016-01-15 08:53:15 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2016-01-15 08:53:15 -0800 |
| commit | 8053d2feb6532f6d2c11ae588e05cdc19120e817 (patch) | |
| tree | eea0ea64e2cff0ebd99cde54220f13c236970c0a /test/cpp/end2end/end2end_test.cc | |
| parent | 54099aa46f63238275dd626390176d72eecc947a (diff) | |
| parent | d50a4ee2c257ddfadccb9d252e2b61d6ff544d96 (diff) | |
Merge remote-tracking branch 'upstream/master' into sync_async_mix
Diffstat (limited to 'test/cpp/end2end/end2end_test.cc')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index b580577993..58b20e61c9 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -1,6 +1,6 @@ /* * - * Copyright 2015, Google Inc. + * Copyright 2015-2016, Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |