OSDN Git Service

resolve merge conflicts of 405ec18 to nyc-dev
authorSharvil Nanavati <sharvil@google.com>
Thu, 28 Apr 2016 21:54:35 +0000 (14:54 -0700)
committerSharvil Nanavati <sharvil@google.com>
Fri, 29 Apr 2016 02:03:23 +0000 (19:03 -0700)
commit2ef994a0abccc556de97c22d517001801f344046
treeee356e60ccc6708c037328d479d9725aee2b72ca
parent3a44a7a4f6b2dec169097152739d7fdd38482b72
parent405ec1816fb9345791ad438e754118a1e55d98dd
resolve merge conflicts of 405ec18 to nyc-dev

Change-Id: I94b431287ae831d64dc734f8cd3f071e49a9d6eb
device/include/interop.h
device/include/interop_database.h
device/src/interop.c
stack/avdt/avdt_l2c.c