Lorenzo Colitti e9aac55615 Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev ...

am: ec79b10313

Change-Id: I2305c4019f56896d741caa509df41416368e5642

2016-06-08 06:39:18 +00:00

..

core/java/com/android/server

Merge changes Ic98e3bcb,Idb0c55fc,Ia8649061,I5e7e5a87 into nyc-mr1-dev

2016-06-08 06:39:18 +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