Mark Salyzyn db15537e6e resolve merge conflicts of 082a1721b516 to master ...

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: I17f178f425975c1c0dbd48091d25b101956d505e

2017-01-11 08:30:17 -08:00

..

java/android

Merge changes from topics 'List parent profile custom ringtones from managed profile', 'Add/delete custom ringtones from storage'

2017-01-06 19:35:59 +00:00

jni

resolve merge conflicts of b53d984 to master

2016-12-22 12:00:24 -08:00

lib

…

mca

Replace cutils/log.h and log/logger.h with log/log.h

2017-01-09 14:31:34 -08:00

packages/BluetoothMidiService

…

tests

Camera: Updates in preparation for HIDL

2016-12-13 12:12:21 -08:00