OSDN Git Service

Merge commit '07772caf5ca22365dd62bc042de179a4da55f665' into remote
authorNaveen Kumar <kumarn@codeaurora.org>
Tue, 6 Dec 2016 14:02:12 +0000 (19:32 +0530)
committerNaveen Kumar <kumarn@codeaurora.org>
Tue, 6 Dec 2016 14:02:12 +0000 (19:32 +0530)
commit1f8c0e2f7937b2e1baabf79cc558be45e0dd6164
tree401d221cc6c782694235150581a3e87c8cab9556
parentb46b3ddc43134a6ea3ba4cb843971208f37fadb1
parent07772caf5ca22365dd62bc042de179a4da55f665
Merge commit '07772caf5ca22365dd62bc042de179a4da55f665' into remote

Conflicts:
device/include/interop_database.h

Change-Id: Ib74501079c29033065b1fa2335777c69edcfda23
btif/src/btif_av.c
btif/src/btif_media_task.c
device/include/interop.h
device/include/interop_database.h
device/src/interop.c