Junyu Lai 70626e3b94 Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab ...

am: 745952eac8

Change-Id: I24b45f860992626968a6adfb0ff6b6389c85cf45

2018-10-19 09:26:39 -07:00

..

java

Merge "Add new callback to inform blocking of network on specific uid." am: f709e754ab

2018-10-19 09:26:39 -07:00

jni

Merge "Move bpf project to system/bpf"

2018-10-17 13:55:43 -07:00

proto

Merge "Phone service state change atom."

2018-10-10 15:24:17 -07:00

res

resolve merge conflicts of aad998c0b4 to pi-dev-plus-aosp

2018-10-18 13:44:22 +00:00

tests

Merge "Remove explicit dependencies on conscrypt" am: ca980ac83c

2018-10-15 13:37:38 -07:00