Commit Graph

13949 Commits

Author SHA1 Message Date
Geoff Mendal 404e707cda am 7f4a1da1: (-s ours) Import translations. DO NOT MERGE
* commit '7f4a1da18ef7ffc745e2f8f174fd238397613d7c':
  Import translations. DO NOT MERGE
2015-02-26 22:56:05 +00:00
Geoff Mendal 7f4a1da18e Import translations. DO NOT MERGE
Change-Id: I0ac18cbbc10d46f0264dc6daa7ac8822f540b6bc
Auto-generated-cl: translation import
2015-02-26 12:07:51 -08:00
Geoff Mendal 7262945e4f am 0816a36d: (-s ours) Import translations. DO NOT MERGE
* commit '0816a36dc033a83663958df6e7fa2909e1ea33ac':
  Import translations. DO NOT MERGE
2015-02-12 20:25:13 +00:00
Geoff Mendal 0816a36dc0 Import translations. DO NOT MERGE
Change-Id: I2b851ea0f18a924293a4ee962f7fae3f1a785909
Auto-generated-cl: translation import
2015-02-12 11:41:21 -08:00
Geoff Mendal b8e32c967e am 813e1bfe: (-s ours) am 13ff526b: (-s ours) Import translations. DO NOT MERGE
automerge: eccc844  -s ours

* commit 'eccc8442bf41b6741ce80ca7ea8898a32252815f':
  Import translations. DO NOT MERGE
2014-11-03 23:54:36 +00:00
Geoff Mendal 8eada9d964 am c4127f91: (-s ours) am 46fadb5f: (-s ours) Import translations. DO NOT MERGE
* commit 'c4127f91eb9c1f46e2c1b3d1f6184926817ed866':
  Import translations. DO NOT MERGE
2014-11-03 22:35:49 +00:00
Geoff Mendal 8a463d55b8 am 393c1360: (-s ours) Import translations. DO NOT MERGE
* commit '393c1360fd23de57645440a30920daea757c38c0':
  Import translations. DO NOT MERGE
2014-11-03 22:34:50 +00:00
Geoff Mendal eccc8442bf am 813e1bfe: (-s ours) am 13ff526b: (-s ours) Import translations. DO NOT MERGE
* commit '813e1bfec1fc03a9d87b4cc0fa2d6931f3485eec':
  Import translations. DO NOT MERGE
2014-11-03 21:19:02 +00:00
Geoff Mendal c4127f91eb am 46fadb5f: (-s ours) Import translations. DO NOT MERGE
* commit '46fadb5f585a2ee447bc6997216d3db70571217c':
  Import translations. DO NOT MERGE
2014-11-03 21:13:36 +00:00
Geoff Mendal 813e1bfec1 am 13ff526b: (-s ours) Import translations. DO NOT MERGE
* commit '13ff526ba803087944fc857ca2dfb3982ff25a65':
  Import translations. DO NOT MERGE
2014-11-03 21:11:42 +00:00
Geoff Mendal 13ff526ba8 Import translations. DO NOT MERGE
Change-Id: I8153cef016b0ea76fa417fab11ea1e0935809be6
Auto-generated-cl: translation import
2014-11-03 12:52:32 -08:00
Geoff Mendal 393c1360fd Import translations. DO NOT MERGE
Change-Id: Ibe9ea47c290b5897a1515e6a834d287007dc5b43
Auto-generated-cl: translation import
2014-11-03 12:51:32 -08:00
Geoff Mendal 46fadb5f58 Import translations. DO NOT MERGE
Change-Id: I0be4d98b7f5583b1d2d5f61c2f6c39d768fcba05
Auto-generated-cl: translation import
2014-11-03 12:50:43 -08:00
Paul Westbrook f27710dd69 am aeaa7616: am 19c35f5f: am 1c0662f9: fix bad merge
* commit 'aeaa76164ac1ded4e932ca27426bacad5ce0edf3':
  fix bad merge
2014-11-02 20:55:01 +00:00
Paul Westbrook aeaa76164a am 19c35f5f: am 1c0662f9: fix bad merge
* commit '19c35f5f574a1ccf1447c17d55cb1828d09ab140':
  fix bad merge
2014-11-02 20:51:14 +00:00
Paul Westbrook 19c35f5f57 am 1c0662f9: fix bad merge
* commit '1c0662f998ab83976e5eba544d366876e28e8968':
  fix bad merge
2014-11-02 20:47:24 +00:00
Paul Westbrook 1c0662f998 fix bad merge
Change-Id: I3cb09668bbb629237edbe683b11bbad13aabfe92
2014-11-02 12:43:08 -08:00
Paul Westbrook 724c98b021 fix bad merge
Change-Id: I6d26de849761bfa31e521e7836ec6358907bbbf9
2014-11-02 12:34:33 -08:00
Paul Westbrook 9a920fd979 resolved conflicts for merge of 7dd59de7 to lmp-mr1-dev-plus-aosp
Change-Id: I877043f64b96b9073652f7cec90bff08dd6e69f5
2014-11-02 11:10:17 -08:00
Geoff Mendal ded6357d8a am 4301e602: (-s ours) am 268485ff: (-s ours) am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE
* commit '4301e602d5d2b7b41d41d39747a8dffbdff1262c':
  Import translations. DO NOT MERGE
2014-11-02 18:53:49 +00:00
Tony Mantler 12a5933af3 am aee74ef4: am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!)
* commit 'aee74ef40d1521f5301d803e9c275285d9d719ee':
  Default to encrypted connections (YAY!)
2014-11-02 18:53:48 +00:00
Martin Hibdon 6efb1c66d0 am 7c74d82b: am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets
* commit '7c74d82bc6580c1fbc1daf387d2c0e7bdc51c585':
  Add additional analytics regarding our SSLSockets
2014-11-02 18:53:47 +00:00
Martin Hibdon c9030e14ab 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
* commit '30d6f0460ce31d190782aa3654c6aeb493d1bd32':
  Add analytics to track of what cipher suites are being used
2014-11-02 18:53:46 +00:00
Martin Hibdon 6b1f582457 am 94190da3: am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed
* commit '94190da369c5c7e4dea7644f9bffb7c994f3576c':
  Allow an external security provider to be installed
2014-11-02 18:53:43 +00:00
Martin Hibdon 78f4dcb52b am 04b77626: am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev
* commit '04b776268b067b4fb56ee9f3f3fedfe465f5eac3':
  Add deprecated cipher suites to our SSLSocket
2014-11-02 18:53:42 +00:00
Anthony Lee 4018b9cc9e am cadbc47f: am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev
* commit 'cadbc47f7963e8a36c91affb2fc5e23a3f36ccbf':
  Fix restoreBodySource key so it returns the correct value.
2014-11-02 18:53:40 +00:00
Martin Hibdon 4d587d6c73 am dedad5cc: am c0e8417e: am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev
* commit 'dedad5ccf7cfa01cba80dfe7a087a86a9b193c24':
  Disable smart foward/reply
2014-11-02 18:53:39 +00:00
Geoff Mendal c702530866 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
* commit '08fdc12c4846eddb04e22b313ea0134caca967b7':
  Import translations. DO NOT MERGE
2014-11-02 18:53:38 +00:00
Tony Mantler 64bbe34de9 am 12866ff1: am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing
* commit '12866ff17eee1778ce5b2571d030faef3454917f':
  Don't assume mHostAuthRecv is loaded when checking outgoing
2014-11-02 18:53:37 +00:00
Tony Mantler 35ffcc3a0b am bf98b875: am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev
* commit 'bf98b875c23a859e5cb711298c0d5f190bd4fb7d':
  Fix handling AOL's login rejection
2014-11-02 18:53:36 +00:00
Baligh Uddin 78d1614ec4 am 38a40ba6: (-s ours) am 8e9d01c9: (-s ours) am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE
* commit '38a40ba654b8b8ebfae61e508e611fd6dac0683b':
  Import translations. DO NOT MERGE
2014-11-02 18:53:35 +00:00
Régis Décamps 98ceb1d9ca am b6785995: am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx
* commit 'b678599530a437e90b8672d1fc4db1dc30d9cf7a':
  Provider configuration for outlook, yahoo, gmx
2014-11-02 18:53:33 +00:00
Martin Hibdon 40b9f3c7df am f0987d36: am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search
* commit 'f0987d3603fedb63aeafd38d7c0ba8c505a1927e':
  Correctly update UI_SYNC_STATUS upon search
2014-11-02 18:53:32 +00:00
Geoff Mendal b4c0eba750 am fe58e8e0: (-s ours) am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE
* commit 'fe58e8e04615c58b88fd9478e5b0453ede53270c':
  Import translations. DO NOT MERGE
2014-11-02 18:53:31 +00:00
Régis Décamps 81d5ed1f10 am b5e2358f: am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev
* commit 'b5e2358fc113ee61aea6819d1bfe567701249bf4':
  Resend notifications when Accounts are changed
2014-11-02 18:53:30 +00:00
Martin Hibdon e8bcbd3159 am 06a3b269: am 1a10b8f7: am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev
* commit '06a3b26964bba4ce091272ebeedfa908c24cde11':
  Set mailbox uiSyncStatus when IMAP and POP folders are created
2014-11-02 18:53:29 +00:00
Tony Mantler 5249a10e8c am 200adbe9: am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev
* commit '200adbe935ffc182994ec2df341b4bed86e1272a':
  Reload settings immediately after toggling sync
2014-11-02 18:53:28 +00:00
Tony Mantler bd9add46f6 am 22d25e37: am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics
* commit '22d25e3767897948bfde73ab0c0d93af964bedfa':
  Initial account setup analytics
2014-11-02 18:53:26 +00:00
Geoff Mendal 107cacf51e 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
* commit '94c660a0bb7ec7df04e098e81d65213b3ad33bcb':
  Import translations. DO NOT MERGE
2014-11-02 18:53:25 +00:00
Rohan Shah 94409eea47 am 56fd0d48: am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
* commit '56fd0d48b620968cfcd7118b95e3c8da59c4dbe9':
  Revert "Update notification icon asset names (Email)"
2014-11-02 18:53:24 +00:00
Rohan Shah 9e15a6537e am c33016dc: am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email)
* commit 'c33016dc12aa4cd743926fcffc3f39874f699e8c':
  Update notification icon asset names (Email)
2014-11-02 18:53:23 +00:00
Martin Hibdon f120e97a74 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
* commit '28230ce5c86693e93d8a30b1fec2a2ed351ef21c':
  Set the search mailbox's syncState as soon as a search is requested
2014-11-02 18:53:12 +00:00
Martin Hibdon 562f5c9609 am 62318ee6: am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls
* commit '62318ee61f8e1230aa954e5b0b10f5dc9089f555':
  EmailProvider now supports query and getType for cached file urls
2014-11-02 18:53:11 +00:00
Tony Mantler 0989761529 am 92532b1c: am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
* commit '92532b1c213f68aa476b18aded29025393d1de38':
  Account authentication restyling
2014-11-02 18:53:10 +00:00
Régis Décamps 66af7782fe am f24a5de9: am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
* commit 'f24a5de95bbe5d4ee9fd92877bb24bb7c9198ed0':
  Replace "Corporate" by "Exchange".
2014-11-02 18:53:09 +00:00
Tony Mantler 18e8b55b75 am 2b39de91: am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '2b39de91bd3ff844b2b57ef4a3ad49bff5b9279d':
  Restyle account setup flow nav buttons
2014-11-02 18:53:07 +00:00
Geoff Mendal b64e1d2668 am 813b5b9d: (-s ours) am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE
* commit '813b5b9d78bb12baf42b8c4ecd37ced753fc7e8e':
  Import translations. DO NOT MERGE
2014-11-02 18:53:06 +00:00
Baligh Uddin a4ec3b6348 am 037c4356: (-s ours) am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE
* commit '037c43569e3ef52639c1480f1834f3dd8601410f':
  Import translations. DO NOT MERGE
2014-11-02 18:53:05 +00:00
Martin Hibdon f44db892ec am b8209a4c: am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
* commit 'b8209a4c6ad160f2f65c7fb57d86a6967f45a8ad':
  Get SSLSocketFactory from GmsCore
2014-11-02 18:53:03 +00:00
Anthony Lee 51710a73cd am 82319a98: am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev
* commit '82319a98679e1882a2ae0358f347e25e5ab1e836':
  Calculate available background threads for AttachmentService correctly.
2014-11-02 18:53:02 +00:00