merge heads

This commit is contained in:
Jimmy Shih
2011-11-05 12:08:14 -07:00
parent 4e288e4b85
commit c26e63dec3
32 changed files with 1317 additions and 720 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>