OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev
[android-x86/packages-apps-Settings.git] / src / com / android / settings / accounts /
drwxr-xr-x   ..
-rw-r--r-- 7060 AccountPreferenceBase.java
-rw-r--r-- 31513 AccountSettings.java
-rw-r--r-- 23946 AccountSyncSettings.java
-rw-r--r-- 10780 AddAccountSettings.java
-rw-r--r-- 12491 ChooseAccountActivity.java
-rw-r--r-- 24462 ManageAccountsSettings.java
-rw-r--r-- 7043 ManagedProfileSettings.java
-rw-r--r-- 1877 ProviderPreference.java
-rw-r--r-- 4945 SyncStateSwitchPreference.java