From 21e71296b4daebc424d9722e46ae5e633cbb7160 Mon Sep 17 00:00:00 2001
From: Cary Clark <cary@android.com>
Date: Wed, 7 Oct 2009 09:56:38 -0400
Subject: do not merge

Change https://android-git.corp.google.com/g/#change,27762
conflicted when the auto-merger ran -- this implements
the change by hand. The original comments:

Add '&android-home' to the google homepage string

Also, mark it as non-translatable, and remove the translated
versions.

fixes http://b/issue?id=2148022
---
 res/values-es/strings.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'res/values-es')

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 8ceeb2c..b712924 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -240,7 +240,6 @@
     <string name="download_length_required">"No se puede realizar la descarga, porque no es posible determinar el tamaño del elemento."</string>
     <string name="download_precondition_failed">"La descarga se ha interrumpido y no se puede reanudar."</string>
     <string name="activity_instrumentation_test_runner">"Realizador de pruebas del navegador"</string>
-    <string name="homepage_base">"http://www.google.com/m?client=ms-{CID}"</string>
     <string name="search_the_web">"Buscar en la Web"</string>
     <string name="zoom_overview_button_text">"Información general"</string>
 </resources>
-- 
cgit v1.1