Luke Huang 11454a2163 Merge "Network-related commands porting" am: 9b20115264 ...

am: 923aa75d75

Change-Id: I957050b73afed3e6fde908883568b81198310622

2018-10-16 02:19:35 -07:00

..

java

Merge "Network-related commands porting" am: 9b20115264

2018-10-16 02:19:35 -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" am: ca980ac83c

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