Hugo Benichi 477091dd52 Merge "Fix default network transition event recording" into nyc-dev ...

am: c6246b996d

* commit 'c6246b996d0f9c96f5f727d8f9894cb93a17a9b2':
  Fix default network transition event recording

Change-Id: Ic6ae9cd2620b1793f53667eb7d84c0b6f56d716e

2016-05-25 03:31:34 +00:00

..

core/java/com/android/server

Merge "Fix default network transition event recording" into nyc-dev

2016-05-25 03:31:34 +00:00

net/java/android/net/apf

ApfFilter unit test

2016-05-10 11:54:42 -04:00

tests/servicestests

Lock down networking when waiting for always-on

2016-05-19 00:26:53 +01:00