Wink Saville 2e63bb7ef5 Merge commit '68513498' into fix-merge-conflict ...

* commit '68513498':
  Add checkMobileProvisioning to ConnectivityService.

Conflicts:
	services/java/com/android/server/ConnectivityService.java

Change-Id: Ieceb9c8f4aa4fa99258e56a720b4c74512369458

2013-07-01 16:12:31 -07:00

..

java/android/net

Merge commit '68513498' into fix-merge-conflict

2013-07-01 16:12:31 -07:00

jni

Don't update routes if Dhcp fails.

2013-03-15 10:48:46 -07:00

tests/coretests

Fix LinkProperties's equals() method.

2013-04-02 10:08:59 +09:00