OSDN Git Service

Merge "[KA09] add keepalive offload permission to shell" am: bc350db984
authorMark Chien <markchien@google.com>
Fri, 29 Mar 2019 06:43:45 +0000 (23:43 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Mar 2019 06:43:45 +0000 (23:43 -0700)
am: b15da9fb19

Change-Id: Ieab8acf24f294d758667230b5c07a6540419186d


Trivial merge