Etan Cohen e7395027cf [NAN] Add transport type for NAN. [DO NOT MERGE] ...

Add TRANSPORT_WIFI_NAN - specifies a peer-to-peer Wi-Fi NAN data
connectivity request.

While NAN uses Wi-Fi L1 PHY and part of the MAC - it is a different
protocol and constitutes a different transport.

(cherry-pick of commit 7473bc20ad)

Bug: 26564277
Change-Id: I975ebc72d8f97a592d18038b3d6465b7a40efa75

2016-09-06 15:54:10 -07:00

..

java/android/net

[NAN] Add transport type for NAN. [DO NOT MERGE]

2016-09-06 15:54:10 -07:00

jni

resolve merge conflicts of bc90502 to nyc-dev-plus-aosp

2016-05-13 08:57:40 -07:00

tests/coretests

NetworkStats.Bucket API polish.

2016-03-14 11:24:12 -07:00