OSDN Git Service

Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b
authornharold <nharold@google.com>
Wed, 12 Apr 2017 18:39:15 +0000 (18:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 12 Apr 2017 18:39:15 +0000 (18:39 +0000)
am: 176bfb58c6

Change-Id: I056e52c4c3bf41ffaf482ebaf4c7b14a9091f3ca


Trivial merge