Lorenzo Colitti 68cab31ce1 resolved conflicts for merge of b5f86615 to mnc-vt-dev ...

Change-Id: Ic16a7e4b146e6b2af00ae17976f876ace29a60e8

2015-07-29 09:52:48 +09:00

..

core/java/com/android/server

resolved conflicts for merge of b5f86615 to mnc-vt-dev

2015-07-29 09:52:48 +09:00

tests/servicestests

Fallback to Cellular if WiFi fails to validate

2015-07-09 10:26:17 -04:00