Merge heads

This commit is contained in:
youtaol
2012-07-06 14:41:50 +08:00
parent 9a24f12e11
commit 812ca57d42
180 changed files with 1201 additions and 737 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>