OSDN Git Service

Merge changes from topic 'ipsec-api-tweaks-merge' into oc-dev am: 9361283073
authorNathan Harold <nharold@google.com>
Fri, 14 Apr 2017 20:35:47 +0000 (20:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Apr 2017 20:35:47 +0000 (20:35 +0000)
am: 3ce4d95d22

Change-Id: Ib34939764f9f347ad245c3497d36ed61c093e8eb


Trivial merge