OSDN Git Service

Merge changes from topic 'ipsec-hide-overloads'
authornharold <nharold@google.com>
Tue, 18 Apr 2017 21:51:25 +0000 (21:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Apr 2017 21:51:25 +0000 (21:51 +0000)
am: fe358c6adf

Change-Id: Ia28149a13cae7b5bdcb6f41d1f6cd4d37fbaf88b


Trivial merge