OSDN Git Service

Fix more merge issues in BluetoothPbapVcardManager.java
authorAndre Eisenbach <eisenbach@google.com>
Fri, 25 Mar 2016 21:39:40 +0000 (14:39 -0700)
committerAndre Eisenbach <eisenbach@google.com>
Fri, 25 Mar 2016 21:39:40 +0000 (14:39 -0700)
commitc438463431b171a67b22b50886ef8dd737c44004
tree479defebef08c774d5166703122f7d84c8e98753
parent5211519fa7617f3e34b214264f59157db9f495aa
Fix more merge issues in BluetoothPbapVcardManager.java

Change-Id: I901042e69b3beea93684fe1a194353664fabd0c2
src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java