Merging to head

This commit is contained in:
Rodrigo Damazio
2011-03-11 23:55:53 -03:00
parent d52aca1d3d
commit 06fceb07cc
12 changed files with 105 additions and 19 deletions
+7
View File
@@ -173,4 +173,11 @@ limitations under the License.
android:persistent="false" />
</PreferenceCategory>
</PreferenceScreen>
<!-- Reset to defaults -->
<Preference
android:title="@string/settings_reset"
android:key="@string/reset_key"
android:summary="@string/settings_reset_summary"
android:persistent="false" />
</PreferenceScreen>