Joel Scherpelz 3efe5b07d5 Merge "Support requesting and receiving wakeup events" am: cc03b9e868 am: 4971745cf4 ...

am: 880974f111

Change-Id: I98aa768cf47938aa0996ddabbbc9feb9dae96f1e

2017-05-29 03:51:25 +00:00

..

core/java/com/android/server

Merge "Support requesting and receiving wakeup events" am: cc03b9e868 am: 4971745cf4

2017-05-29 03:51:25 +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