Junyu Lai 745952eac8 Merge "Add new callback to inform blocking of network on specific uid." ...

am: f709e754ab

Change-Id: Ia99ee2fbefa67a7ee00d6fecce430ba6431945cd

2018-10-19 09:14:23 -07:00

..

java

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

2018-10-19 09:14:23 -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

Import translations. DO NOT MERGE

2018-10-14 19:02:45 -07:00

tests

Merge "Remove explicit dependencies on conscrypt"

2018-10-15 13:22:31 -07:00