merge heads

This commit is contained in:
Jimmy Shih
2011-10-28 13:01:29 -07:00
53 changed files with 891 additions and 625 deletions
+3 -3
View File
@@ -127,7 +127,7 @@ limitations under the License.
-->
<!-- 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>
<string name="sensor_type_option_none">Ninguna</string>
<string name="sensor_type_option_ant">ANT+ Sensores</string>
<string name="sensor_type_option_srm_ant_bridge">SRM ANT+ Puente</string>
</resources>