murgatroid99 48c9c4a59e Resolved merge conflicts with master %!s(int64=11) %!d(string=hai) anos
..
channel.cc 724b7c693a clang-format %!s(int64=11) %!d(string=hai) anos
channel.h ecd49345b5 Use clang-format-3.5 %!s(int64=11) %!d(string=hai) anos
channel_arguments.cc ecd49345b5 Use clang-format-3.5 %!s(int64=11) %!d(string=hai) anos
client_context.cc ecd49345b5 Use clang-format-3.5 %!s(int64=11) %!d(string=hai) anos
create_channel.cc ecd49345b5 Use clang-format-3.5 %!s(int64=11) %!d(string=hai) anos
credentials.cc 8fbcc4391e Changing the SSL (Server) Credentials API. %!s(int64=11) %!d(string=hai) anos
internal_stub.cc 1b151096d1 Add impl subdirectory under public and move headers that need to be installed %!s(int64=11) %!d(string=hai) anos