merge heads

This commit is contained in:
Jimmy Shih
2012-03-17 11:54:37 -07:00
parent 6445304c1f
commit da9858d41f
+1 -1
View File
@@ -35,7 +35,7 @@ limitations under the License.
http://maps.google.com/mapfiles/ms/micons/blue-pushpin.png
</string>
<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_privacy_url">www.google.com/policies/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