Automerger Merge Worker b5af3bfb78 Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae ...

Change-Id: I5660cafce05a0e3c6edff03bd645d8df329c5d50

2020-01-09 13:53:42 +00:00

..

core/java/com/android/server

Merge "Fix security problem on PermissionMonitor#hasPermission" into oc-dev am: 5e0b069876 am: d3409a37ae

2020-01-09 13:53:42 +00:00

net/java/android/net

Clarify some IpManager/ApfFilter debugging output.

2017-04-26 17:17:04 +09:00

tests/servicestests/src/com/android/server

Merge "Finish moving NetworkStats tests to tests/net" am: d72f5f7c9a am: cd821b231a

2017-05-18 00:48:14 +00:00