Commit Graph

  • 903a81df6d am 7bf320a7: (-s ours) am 1b24aa02: (-s ours) am 99cf59cb: (-s ours) am ff83aff9: (-s ours) am e421a5e1: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 18:52:31 +0000
  • 0df19789c9 am 47288061: am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold Martin Hibdon 2014-11-02 18:52:29 +0000
  • 13ced23c49 am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 18:52:28 +0000
  • a6446151cc am 93d419dd: am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 18:52:27 +0000
  • 008d5501d9 am a78ba75e: am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 18:52:25 +0000
  • eaafa9a974 am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 18:52:23 +0000
  • e27ea4a2db am 85313f47: (-s ours) am abc613bf: (-s ours) am dc956891: (-s ours) am efca9af6: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev Baligh Uddin 2014-11-02 18:52:22 +0000
  • 0fa53a3367 am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope Tony Mantler 2014-11-02 18:52:20 +0000
  • 6666fbf090 resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp Paul Westbrook 2014-11-02 10:49:50 -0800
  • 7dd59de700 am 2ca250a9: am 47ee4637: resolved conflicts for merge of 19809304 to lmp-sprout-dev Paul Westbrook 2014-11-02 18:41:30 +0000
  • 2ca250a9b7 am 47ee4637: resolved conflicts for merge of 19809304 to lmp-sprout-dev Paul Westbrook 2014-11-02 18:36:49 +0000
  • 47ee463729 resolved conflicts for merge of 19809304 to lmp-sprout-dev Paul Westbrook 2014-11-02 10:33:04 -0800
  • c1ad14a93e am 8eca7d6a: am ee2a66b5: am 3fb948e4: am 800d544a: am 8c6a01f8: Remove app icon from Setup and Mailbox Settings Tony Mantler 2014-11-02 17:50:43 +0000
  • 95d12ced49 am e46c6c10: am 685f2f1d: am 784b61cc: am 34a686ab: am dfb7fe91: Remove password spaces warning Tony Mantler 2014-11-02 17:50:42 +0000
  • a3806ec48c am 31c4a2d0: am 47a2f0f7: am cd77bc1b: am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:50:41 +0000
  • fdfa501250 am 8969e378: am 54013128: am 091ed0db: am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev Paul Westbrook 2014-11-02 17:50:40 +0000
  • 0916e2dc5d am b0a19219: am 4113c904: am 2562a4df: am 61e79746: am c845295f: Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:50:39 +0000
  • a2f4826db7 am 52b81bfe: am 0f493a86: am ec83f7fa: am 5b5d5585: am 86e17ba1: Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev Andrew Sapperstein 2014-11-02 17:50:38 +0000
  • 8ecf96eb82 am a341c92d: am 93d724aa: am 46f73c05: am 7266502c: am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability James Lemieux 2014-11-02 17:50:37 +0000
  • c59b73474f am a59fce8e: am e62810f7: am ac26021d: am d50e207f: am 65669454: Set IME resize flag for AccountServerSettingsActivity Tony Mantler 2014-11-02 17:50:36 +0000
  • ccc15a7f47 am 386c3357: am 32a6138d: am 325afc41: am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored James Lemieux 2014-11-02 17:50:35 +0000
  • 5447fb433e am ec1fa677: (-s ours) am c7332f11: (-s ours) am dd454375: (-s ours) am 9ea9d245: (-s ours) am efb6cb25: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:50:34 +0000
  • 65516fd9f2 am bcf42ff1: am 91232a21: am 39aa4910: am 882e1a89: am e068440f: Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:50:33 +0000
  • e5f590518b am 2d488bf4: am 1db58a95: am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:50:32 +0000
  • 6c8332b1ff am 059c6f36: am 341c8ef2: am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings Martin Hibdon 2014-11-02 17:50:31 +0000
  • fe03f4cc11 am 0d0d4d27: (-s ours) am 0a7f63e0: (-s ours) am eb3588bc: (-s ours) am 94d76eb9: (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours Baligh Uddin 2014-11-02 17:50:29 +0000
  • 5869bbf7d7 am 81bfcfad: am 5d03847c: am 0b27b809: am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6 Jin Cao 2014-11-02 17:50:28 +0000
  • 1ff3372356 am b80fea64: am b0ad7f78: am cdf59599: am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd Jin Cao 2014-11-02 17:50:27 +0000
  • 58422f63aa am 351e982e: am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f Anthony Lee 2014-11-02 17:50:26 +0000
  • 5c2092481a am b9f42561: am 5b366acf: am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179 Jin Cao 2014-11-02 17:50:25 +0000
  • ab5dac4852 am 292cf390: am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7 Jin Cao 2014-11-02 17:50:23 +0000
  • eb7a2e7811 am 544b00f0: am 5a33a789: am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f Tony Mantler 2014-11-02 17:50:22 +0000
  • b1a155d7c0 am 066c3202: am 89a36e1d: am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f Tony Mantler 2014-11-02 17:50:21 +0000
  • 07be492033 am 140784ce: am 61a99bbb: am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df Anthony Lee 2014-11-02 17:50:19 +0000
  • 29159203b5 am ce660a6e: (-s ours) am e19bbf38: (-s ours) am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours Baligh Uddin 2014-11-02 17:50:18 +0000
  • 9021503843 am ae99756f: am 65911dc2: am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b Tony Mantler 2014-11-02 17:50:17 +0000
  • a677c1121b am 32c3580a: am 4ae25d3b: am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50 Anthony Lee 2014-11-02 17:50:15 +0000
  • 5a841aff1d am e80fb6ce: am ad1137d1: am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013 Andrew Sapperstein 2014-11-02 17:50:14 +0000
  • d59532d99b am 87ff47b6: am 49c8521d: am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a Tony Mantler 2014-11-02 17:50:12 +0000
  • 8eca7d6a50 am ee2a66b5: am 3fb948e4: am 800d544a: am 8c6a01f8: Remove app icon from Setup and Mailbox Settings Tony Mantler 2014-11-02 17:44:30 +0000
  • e46c6c10c0 am 685f2f1d: am 784b61cc: am 34a686ab: am dfb7fe91: Remove password spaces warning Tony Mantler 2014-11-02 17:44:29 +0000
  • 31c4a2d045 am 47a2f0f7: am cd77bc1b: am 58310123: am 0ee42176: Merge "Fix spinners layout mangling" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:44:28 +0000
  • 8969e378d9 am 54013128: am 091ed0db: am b4986725: am 6a07fc19: Merge "Remove unused resource" into ub-gmail-ur14-dev Paul Westbrook 2014-11-02 17:44:27 +0000
  • b0a1921985 am 4113c904: am 2562a4df: am 61e79746: am c845295f: Merge "Fix the text of the authentication label on rotation" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:44:26 +0000
  • 52b81bfe5b am 0f493a86: am ec83f7fa: am 5b5d5585: am 86e17ba1: Merge "Set recents color for photoviewer. b/17389434" into ub-gmail-ur14-dev Andrew Sapperstein 2014-11-02 17:44:25 +0000
  • a341c92d59 am 93d724aa: am 46f73c05: am 7266502c: am 3bdce9b5: Remove server-side sanitized HTML capability; add client-side santized HTML capability James Lemieux 2014-11-02 17:44:23 +0000
  • a59fce8eba am e62810f7: am ac26021d: am d50e207f: am 65669454: Set IME resize flag for AccountServerSettingsActivity Tony Mantler 2014-11-02 17:44:22 +0000
  • 386c33574c am 32a6138d: am 325afc41: am 04c77181: am 1be8b05b: The error message "This field can\'t be blank" can be ignored James Lemieux 2014-11-02 17:44:21 +0000
  • ec1fa677bd am c7332f11: (-s ours) am dd454375: (-s ours) am 9ea9d245: (-s ours) am efb6cb25: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:44:20 +0000
  • bcf42ff14b am 91232a21: am 39aa4910: am 882e1a89: am e068440f: Merge "Update search folder status in a finally block" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:44:19 +0000
  • 2d488bf43d am 1db58a95: am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:44:18 +0000
  • 059c6f36c4 am 341c8ef2: am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings Martin Hibdon 2014-11-02 17:44:17 +0000
  • 0d0d4d2711 am 0a7f63e0: (-s ours) am eb3588bc: (-s ours) am 94d76eb9: (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours Baligh Uddin 2014-11-02 17:44:16 +0000
  • 81bfcfad16 am 5d03847c: am 0b27b809: am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6 Jin Cao 2014-11-02 17:44:15 +0000
  • b80fea64d0 am b0ad7f78: am cdf59599: am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd Jin Cao 2014-11-02 17:44:14 +0000
  • 351e982e23 am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f Anthony Lee 2014-11-02 17:44:13 +0000
  • b9f425614d am 5b366acf: am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179 Jin Cao 2014-11-02 17:44:11 +0000
  • 292cf3904d am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7 Jin Cao 2014-11-02 17:44:10 +0000
  • 544b00f009 am 5a33a789: am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f Tony Mantler 2014-11-02 17:44:09 +0000
  • 066c3202dc am 89a36e1d: am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f Tony Mantler 2014-11-02 17:44:08 +0000
  • 140784ce88 am 61a99bbb: am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df Anthony Lee 2014-11-02 17:44:06 +0000
  • ce660a6ebb am e19bbf38: (-s ours) am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours Baligh Uddin 2014-11-02 17:44:05 +0000
  • ae99756ff0 am 65911dc2: am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b Tony Mantler 2014-11-02 17:44:04 +0000
  • 32c3580aee am 4ae25d3b: am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50 Anthony Lee 2014-11-02 17:44:01 +0000
  • e80fb6cefe am ad1137d1: am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013 Andrew Sapperstein 2014-11-02 17:44:00 +0000
  • 87ff47b6ac am 49c8521d: am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a Tony Mantler 2014-11-02 17:43:58 +0000
  • 4301e602d5 am 268485ff: (-s ours) am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 17:38:26 +0000
  • aee74ef40d am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!) Tony Mantler 2014-11-02 17:38:25 +0000
  • 7c74d82bc6 am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets Martin Hibdon 2014-11-02 17:38:24 +0000
  • 30d6f0460c am 97951159: am 0e1bdee9: am 21dc44d2: Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:38:23 +0000
  • 94190da369 am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed Martin Hibdon 2014-11-02 17:38:22 +0000
  • 04b776268b am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:38:21 +0000
  • cadbc47f79 am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev Anthony Lee 2014-11-02 17:38:19 +0000
  • dedad5ccf7 am c0e8417e: am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:38:18 +0000
  • 08fdc12c48 am 96815698: (-s ours) am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev Geoff Mendal 2014-11-02 17:38:17 +0000
  • 12866ff17e am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing Tony Mantler 2014-11-02 17:38:16 +0000
  • bf98b875c2 am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:38:15 +0000
  • 38a40ba654 am 8e9d01c9: (-s ours) am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:38:14 +0000
  • b678599530 am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx Régis Décamps 2014-11-02 17:38:12 +0000
  • f0987d3603 am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search Martin Hibdon 2014-11-02 17:38:11 +0000
  • fe58e8e046 am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 17:38:10 +0000
  • b5e2358fc1 am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev Régis Décamps 2014-11-02 17:38:09 +0000
  • 06a3b26964 am 1a10b8f7: am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:38:08 +0000
  • 200adbe935 am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:38:07 +0000
  • 22d25e3767 am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics Tony Mantler 2014-11-02 17:38:05 +0000
  • 94c660a0bb am fba6f6f3: (-s ours) am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev Geoff Mendal 2014-11-02 17:38:03 +0000
  • 56fd0d48b6 am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)" Rohan Shah 2014-11-02 17:38:02 +0000
  • c33016dc12 am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email) Rohan Shah 2014-11-02 17:38:00 +0000
  • 28230ce5c8 am d51891fb: am 901255ce: am 5fde01e4: Merge "Set the search mailbox\'s syncState as soon as a search is requested" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:37:59 +0000
  • 62318ee61f am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls Martin Hibdon 2014-11-02 17:37:58 +0000
  • 92532b1c21 am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:37:56 +0000
  • f24a5de95b am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev Régis Décamps 2014-11-02 17:37:55 +0000
  • 2b39de91bd am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev Tony Mantler 2014-11-02 17:37:54 +0000
  • 813b5b9d78 am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE Geoff Mendal 2014-11-02 17:37:53 +0000
  • 037c43569e am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE Baligh Uddin 2014-11-02 17:37:52 +0000
  • b8209a4c6a am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev Martin Hibdon 2014-11-02 17:37:51 +0000
  • 82319a9867 am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev Anthony Lee 2014-11-02 17:37:50 +0000
  • 93a6c2c36a am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email) Rohan Shah 2014-11-02 17:37:49 +0000
  • 2df883ac09 am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 17:37:48 +0000
  • 9486b7512e am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev Rohan Shah 2014-11-02 17:37:47 +0000