summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmith Yamasani <yamasani@google.com>2013-05-15 13:34:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-15 13:34:55 -0700
commite3a133a815fc1b8b9e39c499f251e36c87346e1c (patch)
treee8513de40366ba678fbe20113146b6ed45f2da31
parent777e2e8545e37dfaf27f0f0ccd835f64fab7b746 (diff)
parentb865d578158150a13ca080c2525091a7722e75e3 (diff)
downloadframeworks_base-e3a133a815fc1b8b9e39c499f251e36c87346e1c.zip
frameworks_base-e3a133a815fc1b8b9e39c499f251e36c87346e1c.tar.gz
frameworks_base-e3a133a815fc1b8b9e39c499f251e36c87346e1c.tar.bz2
am b865d578: Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev
* commit 'b865d578158150a13ca080c2525091a7722e75e3': Opt-in Settings package to see restricted accounts
-rw-r--r--core/res/res/values/config.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 0313308..6322d30 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1102,7 +1102,7 @@
>android/android.accounts.ChooseTypeAndAccountActivity</string>
<!-- Apps that are authorized to access shared accounts, overridden by product overlays -->
- <string name="config_appsAuthorizedForSharedAccounts"></string>
+ <string name="config_appsAuthorizedForSharedAccounts">;com.android.settings;</string>
<!-- Flag indicating that the media framework should not allow changes or mute on any
stream or master volumes. -->