tree 6dc4ea1349450fe86f9117840c0ea9c5c61efc9d
parent 605c9b0ce59874e99e31d992fe6629374a0efd2c
parent f26430a0d842481f34bb1c96be2fc5ad4e15c60d
author Roshan Pius <rpius@google.com> 1495046628 +0000
committer android-build-merger <android-build-merger@google.com> 1495046628 +0000

Merge "WifiP2pWfdInfo: Only pass the wfd info to WifiNative" into oc-dev am: 26ff5a67ee
am: f26430a0d8

Change-Id: I31f6e7d74604debe70b1f83ce4436c9e284c4307