OSDN Git Service

Merge changes from topic 'ipsec-transport-impl' am: 464dc5c07e
authornharold <nharold@google.com>
Sun, 2 Apr 2017 00:27:38 +0000 (00:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 2 Apr 2017 00:27:38 +0000 (00:27 +0000)
commit8108bef16db6034b17be16baa611dc3525f940ac
treec9ffa859d46f723e7d81f50ebbb3368bdd7a1fc4
parent37f260f5d8d88b9339b9c53a889867eede4234a7
parentf983d8908337a3b415391efd4ed78ed6836b051a
Merge changes from topic 'ipsec-transport-impl' am: 464dc5c07e
am: f983d89083

Change-Id: Ifbee28deb7bee43532b923193cade15dad4ee5b9