Merge with c31ef4ac66823a80d02265da7810432b51ce01ed

MyTracks/AndroidManifest.xml

@@ -158,10 +158,12 @@ limitations under the License.
   <uses-permission android:name="com.google.android.apps.mytracks.TRACK_NOTIFICATIONS" />
 
   <!-- Features required -->
+  <!--
   <uses-feature android:name="android.hardware.location" android:required="true"/>
   <uses-feature android:name="android.hardware.location.gps" android:required="true"/>
   <uses-feature android:name="android.hardware.touchscreen" android:required="true"/>
-
+  -->
+  
   <!-- Features optional -->
   <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
   <uses-feature android:name="android.hardware.location.network" android:required="false"/>

MyTracks/res/layout/about.xml

@@ -58,6 +58,11 @@ limitations under the License.
       android:layout_height="wrap_content"
       android:layout_width="wrap_content"
       android:orientation="vertical">
+      <TextView
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:text="@string/about_bart"
+        android:textSize="20sp" />
       <TextView
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"

MyTracks/res/values-pl/strings.xml

@@ -361,6 +361,8 @@ limitations under the License.
   <string name="about_version">Wersja:</string>
   <string name="about_email">Wsparcie</string>
   <string name="about_support">Wsparcie:</string>
+  
+  <string name="about_bart">Bartłomiej Niechwiej</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Wyślij do...</string>

MyTracks/res/values/strings.xml

@@ -388,6 +388,7 @@ limitations under the License.
   <string name="about_googlegroups">mytracks@googlegroups.com</string>
   <string name="about_weburl">mytracks.appspot.com</string>
   <string name="about_copyright_message">Copyright 2009 Google Inc.</string>
+  <string name="about_bart">Bartlomiej Niechwiej</string>
   <string name="about_dylan">Dylan Casey</string>
   <string name="about_leif">Leif Hendrik Wilden</string>
   <string name="about_rdamazio">Rodrigo Damazio Bovendorp</string>