am fb6549b9: am d530494d: Provide a button to allow the user to set the home page...

author Leon Scroggins <scroggo@google.com>

Thu, 10 Dec 2009 22:43:09 +0000 (14:43 -0800)

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

Thu, 10 Dec 2009 22:43:09 +0000 (14:43 -0800)
author Leon Scroggins <scroggo@google.com>
Thu, 10 Dec 2009 22:43:09 +0000 (14:43 -0800)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 10 Dec 2009 22:43:09 +0000 (14:43 -0800)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/browser/BrowserActivity.java
Simple merge
author	Leon Scroggins <scroggo@google.com>
	Thu, 10 Dec 2009 22:43:09 +0000 (14:43 -0800)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 10 Dec 2009 22:43:09 +0000 (14:43 -0800)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/browser/BrowserActivity.java	patch \|	diff1 \|	diff2 \|	blob \| history