Junyu Lai 0affe5dad2 Merge changes from topic "ka05" am: b3656c7b1b am: 14e51c8a84 ...

am: 3dea854998

Change-Id: Ie56c431a6d934c752d1de30fc4bf98a7e557e5b2

2019-01-23 22:24:41 -08:00

..

android

Merge changes I1250730c,I7d00848c am: e693d49c0a am: 9026fb46cc

2019-01-23 09:01:09 -08:00

com/android

[KA05] Export keepalive offload api for IpSec Nat-T file descriptor

2019-01-24 00:40:25 +08:00