OSDN Git Service

resolve merge conflicts of 934747d to nyc-dev-plus-aosp
authorAndre Eisenbach <eisenbach@google.com>
Mon, 30 May 2016 23:23:11 +0000 (16:23 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Mon, 30 May 2016 23:23:11 +0000 (16:23 -0700)
commit6efca2e76bb58f2949d93cbd7f5a9cb0dc276f9a
tree76d6442bc8fb38856233349737055dc3bd47203a
parent072f7adec1cf0809accc4490a138ce15bd496483
parent934747dc9cd473d4c0a3ee284d67173c87aa3017
resolve merge conflicts of 934747d to nyc-dev-plus-aosp

Change-Id: Ifea8e5daf03ae684ad22e0dc790ae1bd26ba0035
btif/src/btif_media_task.cc