OSDN Git Service

[automerger skipped] Merge "[KA09] add keepalive offload permission to shell" am...
authorMark Chien <markchien@google.com>
Fri, 29 Mar 2019 06:53:21 +0000 (23:53 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 29 Mar 2019 06:53:21 +0000 (23:53 -0700)
commitf57d3c89b74d5b5ad70eedc4802f226cabc472ca
treebccf8356ad1af1bb2ad875e779835615470a580d
parent67e9426eb67e99dd476cdda0f6a5b88db98bc02a
parent2be1be042638ea32894974a31451904f217b4970
[automerger skipped] Merge "[KA09] add keepalive offload permission to shell" am: bc350db984 am: b15da9fb19
am: 2be1be0426 -s ours
am skip reason: change_id Ib6660a5eaa72f83042596481452be4d415383f02 with SHA1 5e430e5a39 is in history

Change-Id: I15932279b389865001eb32fb0161914e65bc9450