am c47e9733: am 3f475149: Merge "Make "search by number" function work" into gingerbread

author Jaikumar Ganesh <jaikumar@google.com>

Mon, 11 Oct 2010 17:42:08 +0000 (10:42 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 11 Oct 2010 17:42:08 +0000 (10:42 -0700)
author Jaikumar Ganesh <jaikumar@google.com>
Mon, 11 Oct 2010 17:42:08 +0000 (10:42 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 11 Oct 2010 17:42:08 +0000 (10:42 -0700)
diff --cc src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java

index cccbd0d,74fefc8..cccbd0d

mode 100755,100644..100644
--- 1/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
--- 2/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
+++ b/src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java
diff --cc src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java
Simple merge
author	Jaikumar Ganesh <jaikumar@google.com>
	Mon, 11 Oct 2010 17:42:08 +0000 (10:42 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 11 Oct 2010 17:42:08 +0000 (10:42 -0700)
		1	2
src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/bluetooth/pbap/BluetoothPbapVcardManager.java	patch \|	diff1 \|	diff2 \|	blob \| history