Lorenzo Colitti bc319b4349 Merge changes from topic 'no_internet' ...

* changes:
  Add a noInternetAccessExpected boolean to WifiConfiguration.
  Prompt if a network without an Internet connection is selected
  Give SystemUI the OVERRIDE_WIFI_CONFIG permission.
  Add an UNKNOWN_UID constant to WifiConfiguration.

2015-04-15 11:48:22 +00:00

..

java/android/net

Merge changes from topic 'no_internet'

2015-04-15 11:48:22 +00:00

jni

Merge commit 'e593d0a' into merge_work

2015-04-10 15:58:10 -07:00

tests/coretests

am 73e056d3: am 402f2501: am 3312c6b9: Merge "Add android.net.IpPrefix#contains()"

2015-04-14 09:58:38 +00:00