merge heads

2012-02-01 17:55:01 -08:00
parent ae24966c42
commit 3b5fba9b52
216 changed files with 7072 additions and 7457 deletions
@@ -37,6 +37,9 @@ limitations under the License.
  <string name="my_tracks_analytics_id">UA-7222692-2</string> 
  <string name="my_tracks_privacy_url">m.google.com/privacy</string>
  <string name="my_tracks_recording_service_name">My Tracks Recording Service</string>
+  <string name="my_tracks_support_url">
+    groups.google.com/a/googleproductforums.com/forum/#!categories/maps/mytracks
+  </string>
  <string name="my_tracks_web_url">mytracks.appspot.com</string>
  <string name="permission_notification_value">
    com.google.android.apps.mytracks.MYTRACKS_NOTIFICATIONS