Merge with head.

This commit is contained in:
Sandor Dornbush
2011-07-05 16:33:45 -07:00
parent b588bb02f4
commit 29df8762e2
83 changed files with 3928 additions and 2855 deletions
+4
View File
@@ -128,4 +128,8 @@ limitations under the License.
$6 : Speed units (mph) : Pace units (per mile)
-->
<!-- Sensor Type Options -->
<string name="no_sensor_option">Ninguna</string>
<string name="ant_sensor_option">ANT+ Sensores</string>
<string name="ant_bridge_sensor_option">SRM ANT+ Puente</string>
</resources>