merge heads

This commit is contained in:
Jimmy Shih
2011-10-31 09:41:15 -07:00
parent c1d4dd92cd
commit 507ab6723c
26 changed files with 570 additions and 289 deletions
-2
View File
@@ -34,8 +34,6 @@ limitations under the License.
<!-- Common -->
<string name="license">Licencia</string>
<string name="close">Cerrar</string>
<string name="edit">Editar</string>
<string name="save">Guardar</string>
<!-- Placemark labels for start and end of track -->