Merge heads

2013-08-22 10:14:45 +08:00
parent 83b1fb67bf
commit b6b54923b2
37 changed files with 434 additions and 221 deletions
@@ -19,7 +19,7 @@ limitations under the License.
  <Preference
    android:key="@string/settings_backup_key"
    android:persistent="false"
-    android:title="@string/settings_backup_now" />
+    android:title="@string/settings_backup" />
  <Preference
    android:key="@string/settings_restore_key"
    android:persistent="false"