diff options
| author | Bryce Lee <brycelee@google.com> | 2015-10-16 22:33:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-16 22:33:53 +0000 |
| commit | bd2c23b4b5ed2920956f4215c21a2a93a58a748d (patch) | |
| tree | 1c58c15960acad38ac9c6246a9775a9dba7ab60e /res | |
| parent | a4c743b01cdf1e757bf02b3ba3e9797c7ff53a33 (diff) | |
| parent | 6d984fe7bca83276c9de36e1d4522940ac5e4ea2 (diff) | |
| download | android_packages_services_Telephony-bd2c23b4b5ed2920956f4215c21a2a93a58a748d.tar.gz android_packages_services_Telephony-bd2c23b4b5ed2920956f4215c21a2a93a58a748d.tar.bz2 android_packages_services_Telephony-bd2c23b4b5ed2920956f4215c21a2a93a58a748d.zip | |
am 6d984fe7: Merge "Mark emergency accounts with the correct capability for wear." into cw-e-dev
* commit '6d984fe7bca83276c9de36e1d4522940ac5e4ea2':
Mark emergency accounts with the correct capability for wear.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/config.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 139fb712c..fa730d4b5 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -209,4 +209,7 @@ <!-- Component for custom voicemail notification handling. [DO NOT TRANSLATE] --> <string name="config_customVoicemailComponent">@null</string> + + <!-- Flag indicating whether to allow pstn phone accounts [DO NOT TRANSLATE] --> + <bool name="config_pstn_phone_accounts_enabled">true</bool> </resources> |