Stanley Tng 2350e15f4b Merge "Add Feature Flag for Hearing Aid Profile" ...

am: e4e653b8bf

Change-Id: I53ba5bf7547b66e29a0fbed7b5d596f010dd8a9b

2018-10-15 18:57:59 -07:00

..

java

Merge "Add Feature Flag for Hearing Aid Profile"

2018-10-15 18:57:59 -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