OSDN Git Service

resolved conflicts for merge of 55936599 to stage-korg-master
authorJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 22:04:34 +0000 (14:04 -0800)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 7 Dec 2010 22:04:34 +0000 (14:04 -0800)
commite7f887dab2591a46ecf80616e00f33bb5d847935
tree9b83ab9264fd0c960eba8ca69a6a25881e92885e
parent22e1e357b6053b572820b54ed8f2b8fe3c1eb0f8
parent55936599e88a156fb132a68c2e93d77fdd4e8a2e
resolved conflicts for merge of 55936599 to stage-korg-master

Change-Id: I5f04a3ae2f0246853f16b0fdb209e67df95e6ca8
src/com/android/bluetooth/opp/BluetoothOppManager.java
src/com/android/bluetooth/opp/BluetoothOppNotification.java
src/com/android/bluetooth/opp/BluetoothOppPreference.java
src/com/android/bluetooth/opp/BluetoothOppService.java
src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java
src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java