merge heads

This commit is contained in:
Jimmy Shih
2011-11-04 14:30:35 -07:00
parent 3951f08531
commit fe8cd0b884
22 changed files with 723 additions and 327 deletions
+1 -1
View File
@@ -55,7 +55,7 @@ limitations under the License.
<!-- MyTracks Waypoint Details -->
<!-- MyTracks Settings -->
<string name="settings_not_available_summary">No está disponible en su versión de Android</string>
<string name="settings_announcement_frequency_not_available">No está disponible en su versión de Android</string>
<string name="settings_report_speed_or_pace">Mostrar velocidad</string>