Roy West's fix is stuck in auto-merger

Change-Id: I3290227e95911adc2c2cfc4f4a3b9eceb8066e35
This commit is contained in:
Glenn Kasten
2011-01-26 18:05:54 -08:00
parent 0251821a49
commit c73982cd81

View File

@@ -624,7 +624,7 @@
<string name="crypt_keeper_final_desc" product="tablet"> <string name="crypt_keeper_final_desc" product="tablet">
Encrypt tablet? This operation is irreversible and if you interrupt it, Encrypt tablet? This operation is irreversible and if you interrupt it,
you will lose data! Encryption takes an hour or more.</string> 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, Encrypt phone? This operation is irreversible and if you interrupt it,
you will lose data! Encryption takes an hour or more.</string> you will lose data! Encryption takes an hour or more.</string>