OSDN Git Service

Merge "supplicant(interface): Support P2P operations" am: 849d24ccbf am: ef6f1a48af
authorRoshan Pius <rpius@google.com>
Wed, 9 Nov 2016 18:21:09 +0000 (18:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 9 Nov 2016 18:21:09 +0000 (18:21 +0000)
am: c36bc0e8a7

Change-Id: I802f54a24a9508f900cb7483aa607b23b6dbfa88


Trivial merge