Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a943b033 authored by John Spurlock's avatar John Spurlock Committed by Android Git Automerger
Browse files

am c5b6267d: resolved conflicts for merge of e8962d4b to klp-dev-plus-aosp 

* commit 'c5b6267d':
  Update resource name for renamed string.
parents dcea5eb5 c5b6267d

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -940,7 +940,6 @@ 
  <java-symbol type="string" name="restr_pin_try_later" />

  <java-symbol type="string" name="write_fail_reason_cancelled" />

  <java-symbol type="string" name="write_fail_reason_cannot_write" />

  <java-symbol type="string" name="transient_navigation_confirmation" />

  <java-symbol type="string" name="ssl_ca_cert_noti_by_unknown" />

  <java-symbol type="string" name="ssl_ca_cert_noti_managed" />

  <java-symbol type="string" name="ssl_ca_cert_warning" />