Alex Klyubin f271c6d266 resolve merge conflicts of b53d984 to master ...

Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26

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

..

java/android

resolve merge conflicts of b53d984 to master

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

jni

resolve merge conflicts of b53d984 to master

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

lib

Unbundle RemoteService on TV - part 3

2016-04-22 12:21:34 -07:00

mca

Fix a memory leak.

2016-12-13 15:32:00 -08:00

packages/BluetoothMidiService

…

tests

Camera: Updates in preparation for HIDL

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