merge heads

2011-11-04 15:22:15 -07:00
parent e640d4280a 496e0c0862
commit 827e94b721
22 changed files with 723 additions and 325 deletions
@@ -102,7 +102,7 @@ limitations under the License.
    </activity>

    <activity android:name="com.google.android.apps.mytracks.SettingsActivity"
-              android:label="@string/mytracks_settings" >
+              android:label="@string/settings_title" >
      <intent-filter>
        <category android:name="android.intent.category.PREFERENCE" />
      </intent-filter>