OSDN Git Service

Merge "supplicant(interface): Add interface for WPS" am: 342658139f am: 8499d6b3e0
authorRoshan Pius <rpius@google.com>
Wed, 18 Jan 2017 06:06:38 +0000 (06:06 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 18 Jan 2017 06:06:38 +0000 (06:06 +0000)
am: 743687e99f

Change-Id: Ie169602e2d1950288453823d4abe9b2612ce627a


Trivial merge