Merge changes Ibec13fbe,If89c67c0 am: 27bf33e053 am: e8a6c02fd2

am: 03c9ec1223

Change-Id: I8dc1754d631ac16a99e1c92776a2756ca5b8269e
This commit is contained in:
Josh Hou
2019-10-28 05:43:11 -07:00
committed by android-build-merger
7 changed files with 56 additions and 21 deletions

View File

@@ -124,7 +124,8 @@
<PreferenceCategory
android:key="calling_category"
android:title="@string/call_category">
android:title="@string/call_category"
settings:controller="com.android.settings.network.telephony.CallingPreferenceCategoryController">
<PreferenceScreen
android:key="wifi_calling_key"