am 333a615d: Implement call and SMS shortcuts.

author Dianne Hackborn <hackbod@google.com>

Tue, 26 May 2009 22:06:18 +0000 (15:06 -0700)

committer The Android Open Source Project <initial-contribution@android.com>

Tue, 26 May 2009 22:06:18 +0000 (15:06 -0700)
author Dianne Hackborn <hackbod@google.com>
Tue, 26 May 2009 22:06:18 +0000 (15:06 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Tue, 26 May 2009 22:06:18 +0000 (15:06 -0700)
diff --cc AndroidManifest.xml
Simple merge
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/contacts/ContactsListActivity.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Tue, 26 May 2009 22:06:18 +0000 (15:06 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Tue, 26 May 2009 22:06:18 +0000 (15:06 -0700)
		1	2
AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/contacts/ContactsListActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history