diff options
author | Vijay Pai <vpai@google.com> | 2016-01-13 12:25:33 -0800 |
---|---|---|
committer | Vijay Pai <vpai@google.com> | 2016-01-13 12:25:33 -0800 |
commit | 947ab265bd3e2c3488604e579bc1374e8c3051c8 (patch) | |
tree | 9f51b55e536ef830238df79444b00067b00a3950 /src/python/grpcio/grpc/framework/interfaces/face/face.py | |
parent | 5bd6f2e190f7cdf2857bff27cd4da860acf72aef (diff) | |
parent | 7149ca6bd0ce73a08fa512415d3f641a06a15a75 (diff) |
Merge branch 'master' into bbuf
Diffstat (limited to 'src/python/grpcio/grpc/framework/interfaces/face/face.py')
-rw-r--r-- | src/python/grpcio/grpc/framework/interfaces/face/face.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc/framework/interfaces/face/face.py b/src/python/grpcio/grpc/framework/interfaces/face/face.py index 59da83dc9c..404c3a7937 100644 --- a/src/python/grpcio/grpc/framework/interfaces/face/face.py +++ b/src/python/grpcio/grpc/framework/interfaces/face/face.py @@ -1,4 +1,4 @@ -# Copyright 2015, Google Inc. +# Copyright 2015-2016, Google Inc. # All rights reserved. # # Redistribution and use in source and binary forms, with or without |