OSDN Git Service

Merge commit 'a2f16c01' into m
authorConley Owens <cco3@android.com>
Mon, 2 May 2011 17:54:25 +0000 (10:54 -0700)
committerConley Owens <cco3@android.com>
Mon, 2 May 2011 17:54:25 +0000 (10:54 -0700)
commit73adcc0f5b6051ef514a3f16a2e28eabee2b367e
treead92c9038f61d4f8bdc08adefe8bf8893257102d
parent7bd72d80443b8ee0d8af2664cc726ccd02771996
parenta2f16c010b59d3bc9ff978b178ded62c1e2b9d8f
Merge commit 'a2f16c01' into m

Conflicts:
src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java

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