Lorenzo Colitti 7cc12b83c5 resolved conflicts for merge of 87f93fe6 to mnc-vt-dev ...

Change-Id: I112f476acf812b7ca3052c1544f324b40a04b7fb

2015-07-22 02:00:55 +09:00

..

core/java/com/android/server

resolved conflicts for merge of 87f93fe6 to mnc-vt-dev

2015-07-22 02:00:55 +09:00

tests/servicestests

Fallback to Cellular if WiFi fails to validate

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