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)
commit2be1be042638ea32894974a31451904f217b4970
tree0573e337fcc31e5c16b9b1cdac7d91adaaa74aeb
parent2cc1be3b5a7c99dde97ff6d719652e31a262bdab
parentb15da9fb19e5e8e902c4bc7836505ec8e12720ac
Merge "[KA09] add keepalive offload permission to shell" am: bc350db984
am: b15da9fb19

Change-Id: Ieab8acf24f294d758667230b5c07a6540419186d