Felipe Leme be93c8292a resolve merge conflicts of c65d475 to nyc-mr1-dev-plus-aosp ...

am: 632e3ab174

Change-Id: Ic5a8d119a95930feaf406bca83ee4a4f591675f8

2016-06-21 21:35:16 +00:00

..

core/java/com/android/server

resolve merge conflicts of c65d475 to nyc-mr1-dev-plus-aosp

2016-06-21 21:35:16 +00:00

net/java/android/net/apf

ApfFilter unit test

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

tests/servicestests

Don't treat the lingerExpired broadcast specially.

2016-06-08 14:09:07 +09:00