Merge "HONEYCOMB-277 - Keep-alive timeout exported"
authorMarek Gradzki <[email protected]>
Fri, 25 Nov 2016 08:19:57 +0000 (08:19 +0000)
committerGerrit Code Review <[email protected]>
Fri, 25 Nov 2016 08:19:57 +0000 (08:19 +0000)

Trivial merge