am 3597ea1b: am b7843586: am 7ba4b482: Merge "Fix build" into jb-mr1-dev

* commit '3597ea1b45310e316b2b9689cdbd43b8b53025cf':
  Fix build
This commit is contained in:
Adam Powell
2012-10-03 09:59:10 -07:00
committed by Android Git Automerger

View File

@@ -1410,7 +1410,6 @@
<java-symbol type="string" name="kg_password_wrong_pin_code" />
<java-symbol type="string" name="kg_invalid_sim_pin_hint" />
<java-symbol type="string" name="kg_invalid_sim_puk_hint" />
<java-symbol type="string" name="kg_sim_puk_recovery_hint" />
<java-symbol type="string" name="kg_invalid_puk" />
<java-symbol type="string" name="kg_login_too_many_attempts" />
<java-symbol type="string" name="kg_login_instructions" />