Neil Fuller b0ed2aa01b resolve merge conflicts of 3649f7c to master ...

Change-Id: Ic16950f1c50f7d06d3c9ae08a6f28e292b89c20f

2016-10-06 11:23:06 +01:00

..

java/android

Merge "media: Unhide mpeg2ts format for streaming output format support."

2016-10-04 17:10:23 +00:00

jni

Merge "Use AUDIO_IO_HANDLE_NONE instead of 0"

2016-10-05 17:35:37 +00:00

lib

…

mca

…

packages/BluetoothMidiService

…

tests

resolve merge conflicts of 3649f7c to master

2016-10-06 11:23:06 +01:00