OSDN Git Service

resolve merge conflicts of cd5d41a to master
authorSanket Agarwal <sanketa@google.com>
Mon, 4 Apr 2016 21:50:56 +0000 (14:50 -0700)
committerSanket Agarwal <sanketa@google.com>
Mon, 4 Apr 2016 21:50:56 +0000 (14:50 -0700)
Change-Id: I6c0c97c45247a3e1eeebb9eaca222cc0472f6681

1  2 
btif/src/btif_avrcp_audio_track.cpp

Simple merge