OSDN Git Service

resolve merge conflicts of 3964c51bf2 to nyc-dev
[android-x86/packages-apps-Settings.git] / src / com / android / settings / accounts / ManageAccountsSettings.java
2017-03-09 Dmitry Dementyevresolve merge conflicts of 3964c51bf2 to nyc-dev
2016-09-06 Maurice Lam[Fingerprint] Remove learn more link if not provisioned...
2016-07-15 Jason MonkPre-setup restrictions DO NOT MERGE am: e6ad6e866b...
2016-02-29 Sanket PadaweResolve merge conflicts of b9e837bc78 to nyc-dev
2016-02-20 Samuel TanWifiConfigController: set ca_path and ca_cert to null...
2016-02-17 Geoff MendalImport translations. DO NOT MERGE
2016-02-17 Lorenzo Colittiresolve merge conflicts of c408ab3de6 to nyc-dev
2016-02-17 Nathan HaroldUpdate BandMode Names to support full list, fix off...
2016-02-15 Geoff MendalImport translations. DO NOT MERGE
2016-02-14 SvetoslavDO NOT MERGE Modify system settings: incorrect UI state...
2016-02-10 Geoff MendalImport translations. DO NOT MERGE
2016-02-09 Samuel TanAllow trusted system certificates to be used in EAP...
2016-02-05 Samuel TanCorrectly load saved EAP CA cert and user cert options
2016-02-03 Jason MonkMerge "Change receiver name attribute for DISCOVERABLE_...
2016-02-03 Geoff MendalImport translations. DO NOT MERGE am: 10a758b8b7 ...
2016-02-03 Geoff MendalImport translations. DO NOT MERGE am: dd33e41c5a ...
2016-02-03 Oleksandr PeletskyiMerge "Gray out Wallpapers menu item when setting of...
2016-02-02 Ritesh ReddyMerge "Calling dataChanged() for Net Policy Restriction...
2016-02-02 Jeremy KleinMerge "Add unit tests for TetherService."
2016-02-02 Samuel TanAllow domain suffix match to be set in UI for EAP confi...
2016-02-02 Geoff MendalImport translations. DO NOT MERGE am: 49a9587ade ...
2016-02-02 Geoff MendalImport translations. DO NOT MERGE am: 0873f057db ...
2016-02-01 Geoff MendalImport translations. DO NOT MERGE am: 66382c5667 ...
2016-02-01 Geoff MendalImport translations. DO NOT MERGE am: 67603ccc01 ...
2016-01-29 Noah WangMerge "Adding placeholder for preview screens for scree...
2016-01-28 Daniel SandlerMerge "Revert "Add Emergency Info preference to user...
2016-01-28 Adam LesinskiMerge "Update FakeUid to match new methods in BatterySt...
2016-01-27 Samuel TanDisplay warning if users does not provide CA cert in...
2016-01-27 Samuel TanAdd menu options for not specifying a EAP CA cert and...
2016-01-27 Samuel TanDisable configuring EAP-TLS without user certificate.
2016-01-27 Sanket Padawe[DO NOT MERGE] Disable configuring EAP-TLS/TTLS/PEAP...
2016-01-27 Noah WangMerge "Reflect settings change right after interaction"
2016-01-27 Udam SainiMerge "Adds screen lock as a suggested activity"
2016-01-27 Tony MakMerge "Default apps setting for managed profile"
2016-01-27 Geoff MendalImport translations. DO NOT MERGE am: 963c4b3d41 ...
2016-01-27 Geoff MendalImport translations. DO NOT MERGE am: 9c57679b0e ...
2016-01-27 Chris Wrenport settings over to new metrics enum
2016-01-27 Rubin Xuresolve merge conflicts of 55d7fcbfc2 to master.
2016-01-26 Shishir AgrawalDO NOT MERGE : Unhiding MSIM APIs.
2016-01-25 Geoff MendalMerge "Import translations. DO NOT MERGE" into mnc...
2016-01-25 Geoff MendalImport translations. DO NOT MERGE am: 13391af4fc ...
2016-01-23 Steve Pfetschresolve merge conflicts of 259b6a8029 to master.
2016-01-22 Kenny Rootresolve merge conflicts of bdc6074276 to master.
2016-01-20 Geoff MendalImport translations. DO NOT MERGE am: ffb0eb03a7 ...
2016-01-20 Geoff MendalImport translations. DO NOT MERGE am: bcefb0397f ...
2016-01-18 Geoff MendalImport translations. DO NOT MERGE am: c123a6a923 ...
2016-01-18 Geoff MendalImport translations. DO NOT MERGE am: bd620a7de1 ...
2016-01-15 Stephen LiMerge -s ours commit 'dcd4a64f66'
2016-01-15 Jason MonkMerge "Settings Hooks launch wrong activity" am: 69704608f4
2016-01-14 Bart Searsresolve merge conflicts of 7e0586b7a6 to master.
2016-01-13 Geoff MendalImport translations. DO NOT MERGE am: 6a52aca8ea ...
2016-01-12 Pavel Zhamaitsiakresolve merge conflicts of 5a1e5edeb7 to master.
2016-01-11 Sudheer Shankaam 3ad534aa: am bc956309: Update warning dialog on...
2016-01-11 Geoff Mendalam 0baeee0c: (-s ours) am 79670bbe: (-s ours) Import...
2016-01-11 Alan Viveretteam fb7827f3: am d4988442: Point to Material.Settings...
2016-01-11 Yorke Leeam 80848e20: am 169f824b: Merge "Rename setDefaultDiale...
2016-01-11 Jorim Jaggiam 80134266: am 4a2423ba: Move fingerprint enroll logic...
2016-01-11 Jorim Jaggiam 6ecd1005: am 11eae045: Allow incremental builds...
2016-01-11 Maurice Lamam ab82d2fd: am 9fab5c1d: Merge "[LockSetup] Hide back...
2016-01-11 Maurice Lamam 824b09cb: am 80ca2687: Merge "[WifiSetup] Show progr...
2016-01-11 Jason Monkam e5f7ba7f: am 70c5472f: Merge "Move process stats...
2016-01-11 Geoff Mendalam 6d53b908: (-s ours) am d1b9edab: (-s ours) Import...
2016-01-11 Geoff Mendalam 3eb3af9d: (-s ours) am c5184ff1: (-s ours) Import...
2016-01-08 Mark SalyzynMerge "whitelist "snet_event_log" when turning logs...
2016-01-07 Alex KlyubinMerge "[2/3] Remove unnecessary throws statement in...
2016-01-06 Mark SalyzynMerge "Settings: switch to using ctl.start property...
2016-01-05 Jeff SharkeyMerge "Some text are missing in eject sdcard warning...
2016-01-05 Amith YamasaniMerge "Fix "division by zero" crash after USB mass...
2016-01-04 Jason MonkMerge "fix out of memory with continuous entry and...
2015-12-28 Mark Salyzynresolve merge conflicts of 94ab88228e to master.
2015-12-24 Alex CheungUse "merge -s ours origin/mirror-partner-mm-wireless...
2015-12-23 Nick KralevichMerge "Hide usb mode chooser dialog after disconnected...
2015-12-22 SvetoslavDO NOT MERGE Modify system settings: incorrect UI state...
2015-12-13 Geoff MendalImport translations. DO NOT MERGE am: 1cb1ad2c55 ...
2015-12-13 Geoff MendalRevert "Import translations. DO NOT MERGE" am: 7bafd5ee...
2015-12-13 Geoff MendalImport translations. DO NOT MERGE am: df57be8aef ...
2015-12-09 Amit MahajanMerge "Validate the uri received in ApnEditor."
2015-12-07 Hyejin KimAdd IMS settings to Network setting reset am: 623852f6c...
2015-12-03 Svetoslav GanovMerge "[DO NOT MERGE] Modify system settings: incorrect...
2015-11-26 Andrei StingaceanuMerge "Wire in device owner information into SecuritySe...
2015-11-20 Geoff MendalImport translations. DO NOT MERGE am: 2102350ea3 ...
2015-11-20 Geoff MendalImport translations. DO NOT MERGE am: 2102350ea3 ...
2015-11-19 Jim MillerMerge "Revert "Auto advance fingerprint enrollment...
2015-11-19 Maurice LamMerge "[Fingerprint] Define margins in fingerprint...
2015-11-18 Russell Brennerresolve merge conflicts of 549379737d to master.
2015-11-18 Russell Brenner[DO NOT MERGE] Preserve FRP lock if wiped during SUW...
2015-11-18 Russell Brennerresolve merge conflicts of 7285e2c2fc to master.
2015-11-18 Tony MantlerMerge "Move AnimatedImageView and AuthenticatorHelper...
2015-11-18 Sanket PadaweUncheck checkbox for contact sharing by default for...
2015-11-17 Tony MantlerMove AnimatedImageView and AuthenticatorHelper to Setti...
2015-11-17 Russell BrennerMerge "Block developer settings during SUW" into lmp...
2015-11-17 Russell Brenner[DO NOT MERGE] Preserve FRP lock if wiped during SUW...
2015-11-16 Tony MantlerMerge "Move some methods to DeviceInfoUtils in SettingsLib"
2015-11-13 Robin LeeMerge "VPN settings: grey out policy-restricted menus...
2015-11-13 Sanket PadaweUncheck checkbox for contact sharing by default for...
2015-11-10 Jason MonkMerge "Fix account problems"
2015-11-10 Jason MonkFix account problems
2015-11-09 Jason MonkNull check queryIntentServices am: a4c9492b50 am: e27ca...
2015-11-05 Baligh UddinImport translations. DO NOT MERGE am: 7b9f79bb6e ...
2015-11-04 Jason MonkMerge "Don\'t show MIDI USB option if not supported...
next