From c73982cd819a8c097c57c7fa1d938f48fbbefc4d Mon Sep 17 00:00:00 2001
From: Glenn Kasten <gkasten@google.com>
Date: Wed, 26 Jan 2011 18:05:54 -0800
Subject: [PATCH] Roy West's fix is stuck in auto-merger

Change-Id: I3290227e95911adc2c2cfc4f4a3b9eceb8066e35
---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 55c2be5b7a1..8dc3f0c8042 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -624,7 +624,7 @@
     <string name="crypt_keeper_final_desc" product="tablet">
     Encrypt tablet? This operation is irreversible and if you interrupt it,
     you will lose data! Encryption takes an hour or more.</string>
-    <string name="crypt_keeper_final_desc" product="phone">
+    <string name="crypt_keeper_final_desc" product="default">
     Encrypt phone? This operation is irreversible and if you interrupt it,
     you will lose data! Encryption takes an hour or more.</string>