OSDN Git Service

resolved conflicts for merge of 22e1e357 to master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 21:51:14 +0000 (13:51 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 21:51:14 +0000 (13:51 -0800)
commite1fd97242bcac3c546c35a2576df3fafee04d25a
tree1e7159442ca7f4b16fe15737f1dde5dd81b82a26
parent30e615de6f8d5c407ba53ac98845887c331c51ff
parent22e1e357b6053b572820b54ed8f2b8fe3c1eb0f8
resolved conflicts for merge of 22e1e357 to master

Change-Id: I96ff536c0d1c000a6b6d5b0b2ea5a3849b21985e
src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
src/com/android/bluetooth/pbap/BluetoothPbapService.java
src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java