| commit | d2c918cde11481f98b032c09993340d22d9a905d | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@google.com> | Fri Feb 19 15:44:48 2016 -0800 |
| committer | The Android Automerger <android-build@google.com> | Fri Feb 19 15:44:48 2016 -0800 |
| tree | 3fd605070452459aae376e278012c7e54e4a0197 | |
| parent | 481140fc88821bbf8d20e7381a3d23ebce4c6c31 [diff] | |
| parent | 4a042bdb0819f965cb32b200d16bc26e43f1ce73 [diff] |
merge in nyc-release history after reset to nyc-dev
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 256c347..06a331c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml
@@ -30,6 +30,7 @@ <application android:process="com.android.phone" android:allowClearUserData="false" android:fullBackupOnly="true" + android:backupInForeground="true" android:backupAgent="TelephonyBackupAgent" android:restoreAnyVersion="true" android:label="@string/app_label"