diff options
author | 2016-01-13 12:25:33 -0800 | |
---|---|---|
committer | 2016-01-13 12:25:33 -0800 | |
commit | 947ab265bd3e2c3488604e579bc1374e8c3051c8 (patch) | |
tree | 9f51b55e536ef830238df79444b00067b00a3950 /test/cpp/interop/reconnect_interop_server.cc | |
parent | 5bd6f2e190f7cdf2857bff27cd4da860acf72aef (diff) | |
parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) |
Merge branch 'master' into bbuf
Diffstat (limited to 'test/cpp/interop/reconnect_interop_server.cc')
-rw-r--r-- | test/cpp/interop/reconnect_interop_server.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cpp/interop/reconnect_interop_server.cc b/test/cpp/interop/reconnect_interop_server.cc index e0165476d0..3602b8c2b0 100644 --- a/test/cpp/interop/reconnect_interop_server.cc +++ b/test/cpp/interop/reconnect_interop_server.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 |