Merge "Setting should handle android.settings.SYNC_SETTINGS from managed profile" into pi-dev am: ef088843ae

am: 7ff1a26d03

Change-Id: I19586d174fe2b6b2eac8f68525a81e7cb6039fc0
This commit is contained in:
Rubin Xu
2018-05-17 12:25:28 -07:00
committed by android-build-merger

View File

@@ -3138,6 +3138,8 @@
android:value="com.android.settings.accounts.AccountDashboardFragment"/> android:value="com.android.settings.accounts.AccountDashboardFragment"/>
<meta-data android:name="com.android.settings.category" <meta-data android:name="com.android.settings.category"
android:value="com.android.settings.category.ia.homepage"/> android:value="com.android.settings.category.ia.homepage"/>
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity> </activity>
<activity <activity