Chalard Jean 6997192f35 Merge "Fix a bug where Uri can't parse IPv6 literal addresses." am: 54677a86d4 ...

am: 86ff3f4c7a

Change-Id: Iec4629bc84bb32185be7120a6f5dfc5e97a5dbff

2018-10-19 06:14:19 -07:00

..

java

Merge "Fix a bug where Uri can't parse IPv6 literal addresses." am: 54677a86d4

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