Lorenzo Colitti a34b991bb3 Merge changes Ic366b532,I0179b45b into nyc-dev am: fd38423bd4 ...

am: 6ad667122c

* commit '6ad667122c35098ab62afd92b5ac26937397825b':
  Move PinningNetworkCallback out to a new NetworkPinner class.
  Use MessageUtils in ConnectivityManager.

2016-03-02 07:04:56 +00:00

..

core/java/com/android/server

Merge "ConnectivityService: listen to USER_UNLOCKED too" into nyc-dev am: 2f4286b792

2016-03-02 02:00:05 +00:00

tests/servicestests

Move PinningNetworkCallback out to a new NetworkPinner class.

2016-03-02 12:50:35 +09:00