Zach Johnson b39a419fa4 Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de4a ...

am: 2fb54515a2

Change-Id: Id6f1c11c447ff1896b5df81a7625a643ecebce46

2019-12-06 15:34:45 -08:00

..

java

Merge changes from topics "merge BT bond", "parameterize BT enable", "remove BT isEnabled" am: bd4031de4a

2019-12-06 15:34:45 -08:00

jni

Merge "AudioService: communicate audio HAL process pids to native audioserver" am: e16beef1cd

2019-12-05 15:43:33 -08:00

proto

…

res

Merge "Remove old compatibility layer for old ImsService Impls" am: b0a795a511

2019-12-06 14:25:28 -08:00

tests

Merge "TimeDetector improvements" am: 6e3020490d

2019-12-06 04:08:26 -08:00

xsd

…

TEST_MAPPING

…