Dmitry Dementyev e24780ed4c resolve merge conflicts of 75ae46d035 to lmp-mr1-dev ...

Change-Id: Ib80d006bbd7b76396b4941e001f5c69fb7b643fa
Bug: 33123882
Test: manual tests:

2017-03-07 19:52:02 -08:00

..

AccountPreferenceBase.java

Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS

2014-09-05 16:46:54 +01:00

AccountSettings.java

Modify account settings for better locale resolution

2014-12-03 10:50:54 +00:00

AccountSyncSettings.java

[New RemoveAccount API in Settings App]:

2014-11-19 17:01:32 -08:00

AddAccountSettings.java

SECURITY: Don't pass a usable Pending Intent to 3rd parties.

2014-09-07 17:45:58 -07:00

AuthenticatorHelper.java

Modify account settings for better locale resolution

2014-12-03 10:50:54 +00:00

ChooseAccountActivity.java

Update Settings to use themed Context.getDrawable()

2014-10-10 10:58:58 -07:00

ManageAccountsSettings.java

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev

2017-03-07 19:52:02 -08:00

ProviderPreference.java

Move Account & sync settings into Settings app.

2010-12-01 15:14:09 -08:00

SyncStateSwitchPreference.java

Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

2014-10-16 17:16:26 -07:00