Paul Westbrook
|
cc8f214ccd
|
am 5080a3ad: am 6a62de22: am 954b358a: am 26f193da: am bb68c13a: Changes to support smaller email tombstone apk size
* commit '5080a3adbf658a8323cf3d7eaa7247b383de41e1':
Changes to support smaller email tombstone apk size
|
2014-11-02 19:02:18 +00:00 |
|
Andrew Sapperstein
|
18a3b7a387
|
am 38b299b8: am e2ab82c8: am 625bc3c0: am 6bf29750: am 88929fd2: Switch to targetSdkVersion=21. b/16408109
* commit '38b299b8dd5e2cc174728cb7b08e625bb0cc226c':
Switch to targetSdkVersion=21. b/16408109
|
2014-11-02 19:02:16 +00:00 |
|
Baligh Uddin
|
f7e0570bc3
|
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
* commit '9cb90c3a60cec08fbf3ce60ed1f23144873b58bf':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:14 +00:00 |
|
Baligh Uddin
|
b665c798e2
|
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
* commit '903a81df6de6f3affc04372d8a7d3a264455d574':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:12 +00:00 |
|
Martin Hibdon
|
6702177e81
|
am 0df19789: am 47288061: am 416f9210: am 13666c7f: am 8209d6c0: Display a warning if account is on security hold
* commit '0df19789c920acedc3f0a17cd867b6bac1e18b5a':
Display a warning if account is on security hold
|
2014-11-02 19:02:10 +00:00 |
|
Rohan Shah
|
2ca7643f4d
|
am 13ced23c: am f8ae0f7b: am 505d411d: am 8645bd80: am 58d7f7b2: Merge "Tag Notifications with People (Email)" into ub-gmail-ur14-dev
* commit '13ced23c496be6b22e1f0484cd96ffb65ab5bfe3':
Tag Notifications with People (Email)
|
2014-11-02 19:02:08 +00:00 |
|
Tony Mantler
|
5b93ef6df1
|
am a6446151: am 93d419dd: am 40feb8f9: am 65d130ad: am b3be4655: Merge "Sync account immediately upon restore" into ub-gmail-ur14-dev
* commit 'a6446151cc450bce7e01e07d40a54bd0de67c791':
Sync account immediately upon restore
|
2014-11-02 19:02:06 +00:00 |
|
Tony Mantler
|
26859ae360
|
am 008d5501: am a78ba75e: am f44d334f: am ebfa64a7: am ce6e2de7: Merge "Use correct password dialog for outgoing settings" into ub-gmail-ur14-dev
* commit '008d5501d91dbe67d3accb3a36eee363d71e2a91':
Use correct password dialog for outgoing settings
|
2014-11-02 19:02:04 +00:00 |
|
Tony Mantler
|
9115a12218
|
am eaafa9a9: am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev
* commit 'eaafa9a9748709187c998a8a563a9aacb7b35a70':
Change account type strings for AccountManager UI
|
2014-11-02 19:02:02 +00:00 |
|
Baligh Uddin
|
e7c34de30c
|
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
* commit 'e27ea4a2dbf845545c1155165b20280ef646c6d8':
Import translations. DO NOT MERGE
|
2014-11-02 19:01:59 +00:00 |
|
Tony Mantler
|
dd5a7dad81
|
am 0fa53a33: am 99219eb0: am 86dda976: am a79eed71: am c6d5ec49: No more big yellow envelope
* commit '0fa53a3367458100abed2cf2091482911c544495':
No more big yellow envelope
|
2014-11-02 19:01:57 +00:00 |
|
Paul Westbrook
|
a54d0838b7
|
resolved conflicts for merge of 6666fbf0 to master
Change-Id: I92e53c11119cda4efa3816b5ae030c278bda1290
|
2014-11-02 11:00:40 -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 |
|
Rohan Shah
|
e1c103dc6e
|
am 93a6c2c3: am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit '93a6c2c36adfa051192822c99c3dc2a834accab9':
Move Email Icons (Email)
|
2014-11-02 18:53:01 +00:00 |
|
Rohan Shah
|
7073065d34
|
am 2df883ac: am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
* commit '2df883ac0947958ed97cd83e90998d8a5ed02729':
Update Email Icons
|
2014-11-02 18:53:00 +00:00 |
|
Rohan Shah
|
0114c4017f
|
am 9486b751: am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
* commit '9486b7512ee4eb30136593f29290ba6f56b8803d':
Revert "Clean-up Email Icons"
|
2014-11-02 18:52:59 +00:00 |
|
Rohan Shah
|
e57e10a434
|
am d2ad0933: am 67df0850: am 8a305452: am 6a533823: Merge "Clean-up Email Icons" into ub-gmail-ur14-dev
* commit 'd2ad0933973dcee022f57231ed946d848bcc8e8c':
Clean-up Email Icons
|
2014-11-02 18:52:57 +00:00 |
|
Tony Mantler
|
0c6747a60d
|
am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages
* commit '941d0a4661ef13189f9696949947e5d40f6014ad':
Make sure old body files don't contaminate new messages
|
2014-11-02 18:52:56 +00:00 |
|
James Lemieux
|
f247d7e02e
|
am 417c1ded: am c909ad16: am 826e61c0: am 69ba565b: Merge "Combined view should also display client-side sanitized HTML" into ub-gmail-ur14-dev
* commit '417c1deda20fd5cb76940038a2762a0f0de0b003':
Combined view should also display client-side sanitized HTML
|
2014-11-02 18:52:55 +00:00 |
|
James Lemieux
|
bb8efd3583
|
am ab841bb5: am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit 'ab841bb5548dbf40ff896ad2e2ad128db676af72':
Display sync errors using snackbar and not as a TL footer
|
2014-11-02 18:52:54 +00:00 |
|