Tony Mantler
|
0c39ba15f9
|
am 0c6747a6: am 941d0a46: am 2ba65aec: am fa93a71b: am b62067e3: Make sure old body files don\'t contaminate new messages
* commit '0c6747a60d09b9c9aa0d3f717d8c19d66d7a67a5':
Make sure old body files don't contaminate new messages
|
2014-11-02 19:02:45 +00:00 |
|
James Lemieux
|
91d415ef4c
|
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
* commit 'f247d7e02e4aae32698256a5776f19760d27b0ea':
Combined view should also display client-side sanitized HTML
|
2014-11-02 19:02:44 +00:00 |
|
James Lemieux
|
c8c3c7105e
|
am bb8efd35: am ab841bb5: am 05629b29: am e811c774: am 40236a89: Display sync errors using snackbar and not as a TL footer
* commit 'bb8efd358360d8277f5de6c75f81c9118294aec8':
Display sync errors using snackbar and not as a TL footer
|
2014-11-02 19:02:42 +00:00 |
|
Baligh Uddin
|
82a6c51779
|
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
* commit '9d6bb2cf84a442d5ff801e5e9ded7ac2003ff8ca':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:40 +00:00 |
|
Régis Décamps
|
9fec8062d5
|
am 5d9a2f3d: am c097bb3d: am 32bb6854: am 1b2a0df1: am f99328b0: minor: remove comment that primaryColor is used for ActionBar
* commit '5d9a2f3df05cc39dc10857bd372c4fb1cc94effb':
minor: remove comment that primaryColor is used for ActionBar
|
2014-11-02 19:02:38 +00:00 |
|
Martin Hibdon
|
2e4a3dbfae
|
am d5bded58: am 7ac3a295: am 3381416c: am cacf4c53: am 3c2f782c: When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
* commit 'd5bded58648d8b14788ced34c55ef03a7914072c':
When we migrate Exchange folders, set the sync status to INITIAL_SYNC_NEEDED
|
2014-11-02 19:02:36 +00:00 |
|
Martin Hibdon
|
6ebe3a6ea2
|
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
* commit '036d581c8ceea984f2eeedbdfb6246c85b636708':
Don't allow disabling of the camera with managed profiles
|
2014-11-02 19:02:34 +00:00 |
|
Rohan Shah
|
bad4e4694e
|
am 22f8218c: am 678ca4ba: am 636fed7d: am 33cf634a: am a64435a6: Update colors in Email (ColorRefactor)
* commit '22f8218ccf8756fb4c7479d54dd0d19175ad1944':
Update colors in Email (ColorRefactor)
|
2014-11-02 19:02:33 +00:00 |
|
Martin Hibdon
|
205845e61d
|
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
* commit '639c2f80b8a91f0b027f5310cb97fb5f08496405':
Add ability to clear migration state to debug screen
|
2014-11-02 19:02:31 +00:00 |
|
Martin Hibdon
|
f214c7effe
|
am ffc9591c: am a1401e1c: am 1ae6e4d9: am 4e794038: am 123d4028: Make sure to close a cursor
* commit 'ffc9591cfcfcbc4811a003241e27c20de51afd59':
Make sure to close a cursor
|
2014-11-02 19:02:29 +00:00 |
|
James Lemieux
|
1286b3fc3d
|
am a94b86e5: am 8a39dd56: am 399e0c3c: am 32152d96: am f1b6b3af: Old paper clip asset is removed, which touches a test case here.
* commit 'a94b86e5837cec198a77bdf717f8754202187fc8':
Old paper clip asset is removed, which touches a test case here.
|
2014-11-02 19:02:28 +00:00 |
|
Baligh Uddin
|
dee5bbb6df
|
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
* commit '4fe3ac93b8b320258d060ba5949d17a9e200ac02':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:26 +00:00 |
|
Andrew Sapperstein
|
6c0795a3e5
|
am 672eb2b2: am b3d30510: am a29c6884: am 8fd1a38c: am 9f252e1f: Renaming to support drawer under status bar.
* commit '672eb2b2789a917d23a167c22a64c4ecdd56e375':
Renaming to support drawer under status bar.
|
2014-11-02 19:02:25 +00:00 |
|
Baligh Uddin
|
0b477c5035
|
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
* commit '0aa4e56ffa99b2c32db7f1ac1523d153f8389681':
Import translations. DO NOT MERGE
|
2014-11-02 19:02:23 +00:00 |
|
Martin Hibdon
|
5eb19a6d6d
|
am 1a38750f: am 67a1eec3: am 70f807fb: am 5ae1599a: am 0b693a05: Merge "Fix subfolders of the inbox." into ub-gmail-ur14-dev
* commit '1a38750f90e2971d38d8385557b33a746a6bce49':
Fix subfolders of the inbox.
|
2014-11-02 19:02:21 +00:00 |
|
Paul Westbrook
|
6ce676a212
|
am 74055e85: am 7bee86e7: am 55e10293: am dcaf7988: am 7f32e9c6: Prevent AccountSettingsFragment from being stripped
* commit '74055e85a78113b1b00fbb2e22d1bc009ff58ac3':
Prevent AccountSettingsFragment from being stripped
|
2014-11-02 19:02:20 +00:00 |
|
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 |
|