OSDN Git Service

Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev
authorJan Nordqvist <jannq@google.com>
Wed, 3 Feb 2016 20:00:47 +0000 (20:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 3 Feb 2016 20:00:47 +0000 (20:00 +0000)
commit962c6a81e3f9b3ea6b4b178ca41a87230864525e
tree59c46dc35be453c31d986120c96d61e9d51995e2
parent663928862ac3dc4aa570f1c51db25538e1874272
parentfd600b1113af6f66e28b65f5b53f4a7c751cdef9
Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev
am: fd600b1113

* commit 'fd600b1113af6f66e28b65f5b53f4a7c751cdef9':
  New System APIs for Passpoint r2 app.
Android.mk
api/current.txt
api/system-current.txt
wifi/java/android/net/wifi/WifiConfiguration.java
wifi/java/android/net/wifi/WifiEnterpriseConfig.java
wifi/java/android/net/wifi/WifiManager.java