Hugo Benichi 196ce982d2 Merge \"Fix unsafe concurrent access in LegacyTypeTracker\" into nyc-mr1-dev ...

am: 90b2c781ff

Change-Id: I6af8e185a165009f2b7b6efef764c883488bd7bf

2016-06-27 08:02:44 +00:00

..

core/java/com/android/server

Merge \"Fix unsafe concurrent access in LegacyTypeTracker\" into nyc-mr1-dev

2016-06-27 08:02:44 +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