Ajay Panicker 56d37b7c43 Merge "Synchronize on a static final object to lock mDeviceBusy" ...

am: 34f9a3e9e9

Change-Id: I8547f2f6f7caed16887558416525fb7d40cda46a

2018-10-18 23:24:17 -07:00

..

java

Merge "Synchronize on a static final object to lock mDeviceBusy"

2018-10-18 23:24:17 -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