Merge "[Settings] Fix merge confliction" into stage-aosp-master
This commit is contained in:
committed by
Android (Google) Code Review
commit
2904ea9410
@@ -639,4 +639,8 @@
|
||||
|
||||
<!-- Whether to enable the app battery usage list page feature. -->
|
||||
<bool name="config_app_battery_usage_list_enabled">false</bool>
|
||||
|
||||
<!-- Whether sim related information is visible to the end user. -->
|
||||
<bool name="config_show_sim_info">true</bool>
|
||||
|
||||
</resources>
|
||||
|
Reference in New Issue
Block a user