Merge heads

2012-06-27 10:26:22 +08:00
parent 7bacdf35fb
commit faddce53be
14 changed files with 244 additions and 224 deletions
@@ -47,9 +47,7 @@ limitations under the License.
  <string name="send_to_fusion_tables_key">sendToFusionTables</string>
  <string name="send_to_maps_key">sendToMaps</string>
  <string name="sensor_type_key">sensorType</string>
-  <string name="show_check_units_dialog_key">showCheckUnitsDialog</string>
  <string name="show_confirm_sharing_dialog_key">showConfrimSharingDialog</string>
-  <string name="show_welcome_dialog_key">showWelcomeDialog</string>
  <string name="split_frequency_key">splitFrequency</string>
  <string name="stats_show_coordinate_key">statsShowCoordinate</string>
  <string name="stats_show_elevation_key">statsShowElevation</string>