OSDN Git Service

Merge changes from topic 'ipsec-transport-impl'
authornharold <nharold@google.com>
Sun, 2 Apr 2017 00:19:44 +0000 (00:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 2 Apr 2017 00:19:44 +0000 (00:19 +0000)
am: 464dc5c07e

Change-Id: I6caf23f5fef995f1ad735ea64b99660a5180799f


Trivial merge