Merge branch 'upstream-openssl' into restricted_routes

This commit is contained in:
Jeff Becker 2016-06-19 16:50:51 -04:00
parent 93deb37c94
commit 63c36e917e
44 changed files with 2523 additions and 148 deletions

View file

@ -0,0 +1,6 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<string name="ministro_not_found_msg">Servicio Ministro inesistente. Imposible ejecutar la aplicación.</string>
<string name="ministro_needed_msg">Esta aplicación requiere el servicio Ministro. Instalarlo?</string>
<string name="fatal_error_msg">La aplicación ha causado un error grave y no es posible continuar.</string>
</resources>