Merge commit '5c20034b' into fix
Conflicts: res/values/strings.xml
This commit is contained in:
@@ -130,12 +130,6 @@
|
||||
android:persistent="false"
|
||||
android:entries="@array/screen_timeout_entries"
|
||||
android:entryValues="@array/screen_timeout_values" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="compatibility_mode"
|
||||
android:title="@string/compatibility_mode_title"
|
||||
android:summaryOn="@string/compatibility_mode_summary_on"
|
||||
android:summaryOff="@string/compatibility_mode_summary_off" />
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
Reference in New Issue
Block a user