merge heads

2012-03-20 10:23:19 -07:00
parent 1893c3557d
commit 08a17a58ef
21 changed files with 640 additions and 377 deletions
@@ -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
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 <resources>
+  <style name="ThemeSelector" parent="android:Theme" />
+
  <!--  About page label -->
  <style name="AboutLabel">
    <item name="android:layout_height">wrap_content</item>