Google Git
Sign in
android / platform / packages / apps / Email / HEAD
  1. 19c35f5 am 1c0662f9: fix bad merge by Paul Westbrook · 10 years ago
  2. 1c0662f fix bad merge by Paul Westbrook · 10 years ago
  3. 724c98b fix bad merge by Paul Westbrook · 10 years ago
  4. 13b91b6 resolved conflicts for merge of 9a920fd9 to master by Paul Westbrook · 10 years ago
  5. 9a920fd resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp by Paul Westbrook · 10 years ago
  6. 195ddaf am ded6357d: (-s ours) am 4301e602: (-s ours) am 268485ff: (-s ours) am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  7. 1d5d6f4 am 12a5933a: am aee74ef4: am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!) by Tony Mantler · 10 years ago
  8. 85384ae am 6efb1c66: am 7c74d82b: am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets by Martin Hibdon · 10 years ago
  9. 5461b45 am c9030e14: am 30d6f046: am 97951159: am 0e1bdee9: am 21dc44d2: Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  10. 6b9592b am 6b1f5824: am 94190da3: am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed by Martin Hibdon · 10 years ago
  11. eed5e7d am 78f4dcb5: am 04b77626: am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  12. 471262f am 4018b9cc: am cadbc47f: am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev by Anthony Lee · 10 years ago
  13. 87fd504 am 4d587d6c: am dedad5cc: am c0e8417e: am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  14. b369516 am c7025308: (-s ours) am 08fdc12c: (-s ours) am 96815698: (-s ours) am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev by Geoff Mendal · 10 years ago
  15. 86e9a92 am 64bbe34d: am 12866ff1: am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing by Tony Mantler · 10 years ago
  16. b208347 am 35ffcc3a: am bf98b875: am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  17. 5117d00 am 78d1614e: (-s ours) am 38a40ba6: (-s ours) am 8e9d01c9: (-s ours) am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  18. d42abe0 am 98ceb1d9: am b6785995: am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx by Régis Décamps · 10 years ago
  19. c107d01 am 40b9f3c7: am f0987d36: am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search by Martin Hibdon · 10 years ago
  20. f08c63b am b4c0eba7: (-s ours) am fe58e8e0: (-s ours) am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  21. e689fb3 am 81d5ed1f: am b5e2358f: am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev by Régis Décamps · 10 years ago
  22. ee82bac am e8bcbd31: am 06a3b269: am 1a10b8f7: am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  23. 774ab0e am 5249a10e: am 200adbe9: am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  24. f6524f4 am bd9add46: am 22d25e37: am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics by Tony Mantler · 10 years ago
  25. 1090cd2 am 107cacf5: (-s ours) am 94c660a0: (-s ours) am fba6f6f3: (-s ours) am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev by Geoff Mendal · 10 years ago
  26. 65658de am 94409eea: am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)" by Rohan Shah · 10 years ago
  27. eed3e23 am 9e15a653: am c33016dc: am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email) by Rohan Shah · 10 years ago
  28. ade1ee6 am f120e97a: am 28230ce5: 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 by Martin Hibdon · 10 years ago
  29. 4089921 am 562f5c96: am 62318ee6: am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls by Martin Hibdon · 10 years ago
  30. 8d046b0 am 09897615: am 92532b1c: am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  31. 2a97b79 am 66af7782: am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev by Régis Décamps · 10 years ago
  32. c8fee48 am 18e8b55b: am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  33. bf49eff am b64e1d26: (-s ours) am 813b5b9d: (-s ours) am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  34. c0a920f am a4ec3b63: (-s ours) am 037c4356: (-s ours) am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  35. f027de6 am f44db892: am b8209a4c: am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  36. b3eca78 am 51710a73: am 82319a98: am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev by Anthony Lee · 10 years ago
  37. e9a520f am e1c103dc: am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email) by Rohan Shah · 10 years ago
  38. 7e40de1 am 7073065d: am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev by Rohan Shah · 10 years ago
  39. 45af012 am 0114c401: am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev by Rohan Shah · 10 years ago
  40. d14760b am e57e10a4: am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev by Rohan Shah · 10 years ago
  41. 0c39ba1 am 0c6747a6: am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages by Tony Mantler · 10 years ago
  42. 91d415e am f247d7e0: am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev by James Lemieux · 10 years ago
  43. c8c3c71 am bb8efd35: am ab841bb5: am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer by James Lemieux · 10 years ago
  44. 82a6c51 am 9d6bb2cf: (-s ours) am a8fee47f: (-s ours) am 5edde56b: (-s ours) am 28a37183: (-s ours) am abd75d1a: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  45. 9fec806 am 5d9a2f3d: am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar by Régis Décamps · 10 years ago
  46. 2e4a3db am d5bded58: am 7ac3a295: am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED by Martin Hibdon · 10 years ago
  47. 6ebe3a6 am 036d581c: am 4e91ba99: am a9a341d9: am e9a49c17: am d10ae46e: Merge "Don\'t allow disabling of the camera with managed profiles" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  48. bad4e46 am 22f8218c: am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor) by Rohan Shah · 10 years ago
  49. 205845e am 639c2f80: am 276f275c: am 3c38f6ac: am ef0dc0ac: am 809313bd: Merge "Add ability to clear migration state to debug screen" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  50. f214c7e am ffc9591c: am a1401e1c: am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor by Martin Hibdon · 10 years ago
  51. 1286b3f am a94b86e5: am 8a39dd56: am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here. by James Lemieux · 10 years ago
  52. dee5bbb am 4fe3ac93: (-s ours) am e6556f74: (-s ours) am 21f273ea: (-s ours) am bdfea7ff: (-s ours) am d54cebe5: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  53. 6c0795a am 672eb2b2: am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar. by Andrew Sapperstein · 10 years ago
  54. 0b477c5 am 0aa4e56f: (-s ours) am c95fa16f: (-s ours) am 570fce60: (-s ours) am 928bbfef: (-s ours) am fc1ba99a: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev by Baligh Uddin · 10 years ago
  55. 5eb19a6 am 1a38750f: am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  56. 6ce676a am 74055e85: am 7bee86e7: am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped by Paul Westbrook · 10 years ago
  57. cc8f214 am 5080a3ad: am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size by Paul Westbrook · 10 years ago
  58. 18a3b7a am 38b299b8: am e2ab82c8: am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109 by Andrew Sapperstein · 10 years ago
  59. f7e0570 am 9cb90c3a: (-s ours) am b96905a8: (-s ours) am 45f0c596: (-s ours) am 503f4638: (-s ours) am 3b47856d: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev by Baligh Uddin · 10 years ago
  60. b665c79 am 903a81df: (-s ours) 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 by Baligh Uddin · 10 years ago
  61. 6702177 am 0df19789: am 47288061: am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold by Martin Hibdon · 10 years ago
  62. 2ca7643 am 13ced23c: am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev by Rohan Shah · 10 years ago
  63. 5b93ef6 am a6446151: am 93d419dd: am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  64. 26859ae am 008d5501: am a78ba75e: am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  65. 9115a12 am eaafa9a9: am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  66. e7c34de am e27ea4a2: (-s ours) 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 by Baligh Uddin · 10 years ago
  67. dd5a7da am 0fa53a33: am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope by Tony Mantler · 10 years ago
  68. a54d083 resolved conflicts for merge of 6666fbf0 to master by Paul Westbrook · 10 years ago
  69. ded6357 am 4301e602: (-s ours) am 268485ff: (-s ours) am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  70. 12a5933 am aee74ef4: am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!) by Tony Mantler · 10 years ago
  71. 6efb1c6 am 7c74d82b: am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets by Martin Hibdon · 10 years ago
  72. c9030e1 am 30d6f046: am 97951159: am 0e1bdee9: am 21dc44d2: Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  73. 6b1f582 am 94190da3: am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed by Martin Hibdon · 10 years ago
  74. 78f4dcb am 04b77626: am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  75. 4018b9c am cadbc47f: am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev by Anthony Lee · 10 years ago
  76. 4d587d6 am dedad5cc: am c0e8417e: am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  77. c702530 am 08fdc12c: (-s ours) am 96815698: (-s ours) am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev by Geoff Mendal · 10 years ago
  78. 64bbe34 am 12866ff1: am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing by Tony Mantler · 10 years ago
  79. 35ffcc3 am bf98b875: am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  80. 78d1614 am 38a40ba6: (-s ours) am 8e9d01c9: (-s ours) am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  81. 98ceb1d am b6785995: am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx by Régis Décamps · 10 years ago
  82. 40b9f3c am f0987d36: am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search by Martin Hibdon · 10 years ago
  83. b4c0eba am fe58e8e0: (-s ours) am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  84. 81d5ed1 am b5e2358f: am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev by Régis Décamps · 10 years ago
  85. e8bcbd3 am 06a3b269: am 1a10b8f7: am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  86. 5249a10 am 200adbe9: am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  87. bd9add4 am 22d25e37: am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics by Tony Mantler · 10 years ago
  88. 107cacf am 94c660a0: (-s ours) am fba6f6f3: (-s ours) am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev by Geoff Mendal · 10 years ago
  89. 94409ee am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)" by Rohan Shah · 10 years ago
  90. 9e15a65 am c33016dc: am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email) by Rohan Shah · 10 years ago
  91. f120e97 am 28230ce5: 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 by Martin Hibdon · 10 years ago
  92. 562f5c9 am 62318ee6: am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls by Martin Hibdon · 10 years ago
  93. 0989761 am 92532b1c: am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  94. 66af778 am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev by Régis Décamps · 10 years ago
  95. 18e8b55 am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev by Tony Mantler · 10 years ago
  96. b64e1d2 am 813b5b9d: (-s ours) am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE by Geoff Mendal · 10 years ago
  97. a4ec3b6 am 037c4356: (-s ours) am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 10 years ago
  98. f44db89 am b8209a4c: am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev by Martin Hibdon · 10 years ago
  99. 51710a7 am 82319a98: am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev by Anthony Lee · 10 years ago
  100. e1c103d am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email) by Rohan Shah · 10 years ago