Luke Huang 923aa75d75 Merge "Network-related commands porting" ...

am: 9b20115264

Change-Id: I96b2bb80cca6e9d80f3f0fe08f7b71ce31b67528

2018-10-16 01:09:30 -07:00

..

java

Merge "Network-related commands porting"

2018-10-16 01:09:30 -07:00

jni

Merge "JavaBBinder: implement getInterfaceDescriptor"

2018-10-15 09:40:32 -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