Merge heads

2012-07-03 20:07:00 +08:00
parent ec74968f94
commit 4dddea507f
180 changed files with 1218 additions and 735 deletions
@@ -21,6 +21,7 @@ limitations under the License.
    <item>@string/activity_type_atv</item>
    <item>@string/activity_type_biking</item>
    <item>@string/activity_type_blimp</item>
+    <item>@string/activity_type_boat</item>
    <item>@string/activity_type_climbing</item>
    <item>@string/activity_type_commercial_airplane</item>
    <item>@string/activity_type_cross_country_skiing</item>