14149 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Yohann Roussel	c407643689	-keepclasses is not a proguard option ... It looks like proguard is accepting it and make completion to a valid option even if there's ambiguity beetwen -keepclasseswithmembers and -keepclasseswithmembernames. Jack is not permitting that kind of incomplete options, so fixing. Change-Id: I034e1cb6ecdcd96beec11ac6b30a0baeb1aebba3	2014-12-22 17:11:04 +01:00
Geoff Mendal	d46b7331bd	Import translations. DO NOT MERGE ... Change-Id: I3dba7ef7494fdeb170b47e47b3dbe698d32c6d91 Auto-generated-cl: translation import	2014-12-10 06:32:19 -08:00
Geoff Mendal	ee6e8a6fb1	Import translations. DO NOT MERGE ... Change-Id: Ida4a26ba1f8b9276d171c81cb7b964675403943f Auto-generated-cl: translation import	2014-12-08 09:42:45 -08:00
Geoff Mendal	6be8f548ab	Import translations. DO NOT MERGE ... Change-Id: I2c2a794c08260bcf778fae556e040f6f23800d87 Auto-generated-cl: translation import	2014-12-01 07:31:27 -08:00
Geoff Mendal	17e2c05f7a	Import translations. DO NOT MERGE ... Change-Id: I73b3f97c49183406d83b1c8262613bfe15b8baa2 Auto-generated-cl: translation import	2014-11-24 07:37:25 -08:00
Geoff Mendal	60dcc7cdfe	Import translations. DO NOT MERGE ... Change-Id: I900191f98f910ae49d89eadf748f3986ce7e2362 Auto-generated-cl: translation import	2014-11-19 05:59:30 -08:00
Geoff Mendal	7e7e4e20d0	Import translations. DO NOT MERGE ... Change-Id: I5f570dc10d4d12cb73abb9e9e04daf3e9addafd6 Auto-generated-cl: translation import	2014-11-10 06:06:16 -08:00
Baligh Uddin	5eead94a2a	Import translations. DO NOT MERGE ... Change-Id: I33b5f50821665dd4574408378271cc9c20bf47f0 Auto-generated-cl: translation import	2014-11-07 02:21:23 -08:00
Geoff Mendal	c9407fc5a9	am b8e32c96: (-s ours) am 813e1bfe: (-s ours) am 13ff526b: (-s ours) Import translations. DO NOT MERGE automerge: eccc844 -s ours ... * commit 'b8e32c967ec4dd0b194715c9d029a37f391a837f': Import translations. DO NOT MERGE	2014-11-04 01:17:31 +00: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	6462184e28	am c4127f91: (-s ours) am 46fadb5f: (-s ours) Import translations. DO NOT MERGE ... automerge: 8eada9d -s ours * commit '8eada9d964cf20993615a48ec50ff364050bb2e9': Import translations. DO NOT MERGE	2014-11-03 23:16:29 +00:00
Geoff Mendal	8e5ccfb48d	am 393c1360: (-s ours) Import translations. DO NOT MERGE ... automerge: 8a463d5 -s ours * commit '8a463d55b81008ddc8fb1c3fd0c83ad5678f6c51': Import translations. DO NOT MERGE	2014-11-03 23:10:03 +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	1e86f7978a	Import translations. DO NOT MERGE ... Change-Id: I4793d0f9baccd8d3dc96713562d3cc2ddd983283 Auto-generated-cl: translation import	2014-11-03 12:56:07 -08: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	5a22261ac3	am f27710dd: am aeaa7616: am 19c35f5f: am 1c0662f9: fix bad merge ... * commit 'f27710dd69d93ca89fcdd58c6de876ef0c59b81d': fix bad merge	2014-11-02 21:10:38 +00:00
Paul Westbrook	cd36d76601	resolved conflicts for merge of 724c98b0 to master ... Change-Id: I00f16b76771f10e7008b95c0170d12edf949c96a	2014-11-02 13:08:52 -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	13b91b644a	resolved conflicts for merge of 9a920fd9 to master ... Change-Id: Ib2bcfb818f8a645436d7b2997137b3e15167a3de	2014-11-02 12:04:22 -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	195ddaf883	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 ... * commit 'ded6357d8a248e4f57777352c9b58ef9000d56a1': Import translations. DO NOT MERGE	2014-11-02 19:03:29 +00:00
Tony Mantler	1d5d6f4e5c	am 12a5933a: am aee74ef4: am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!) ... * commit '12a5933af306da68f9da8a59f3da7e6cf05c1bd1': Default to encrypted connections (YAY!)	2014-11-02 19:03:28 +00:00
Martin Hibdon	85384ae09e	am 6efb1c66: am 7c74d82b: am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets ... * commit '6efb1c66d0527a4404636ba148480a0635fd282f': Add additional analytics regarding our SSLSockets	2014-11-02 19:03:27 +00:00
Martin Hibdon	5461b45a97	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 ... * commit 'c9030e14abcc8e03a12e10dbbf071c22c1d31bd3': Add analytics to track of what cipher suites are being used	2014-11-02 19:03:26 +00:00
Martin Hibdon	6b9592b084	am 6b1f5824: am 94190da3: am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed ... * commit '6b1f582457c907acb154f5f326aa6c7a602105c4': Allow an external security provider to be installed	2014-11-02 19:03:25 +00:00
Martin Hibdon	eed5e7d102	am 78f4dcb5: am 04b77626: am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev ... * commit '78f4dcb52be6818dd14fd148758895a3f5d3efad': Add deprecated cipher suites to our SSLSocket	2014-11-02 19:03:24 +00:00
Anthony Lee	471262f90b	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 ... * commit '4018b9cc9ef0b75310c0c3fdba4dd8b24fbae6fe': Fix restoreBodySource key so it returns the correct value.	2014-11-02 19:03:23 +00:00
Martin Hibdon	87fd5040cb	am 4d587d6c: am dedad5cc: am c0e8417e: am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev ... * commit '4d587d6c730da796047813f972cf3b6478aa686d': Disable smart foward/reply	2014-11-02 19:03:21 +00:00
Geoff Mendal	b369516b94	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 ... * commit 'c702530866f25ac5d88c1a94e27c76a166afd65a': Import translations. DO NOT MERGE	2014-11-02 19:03:20 +00:00
Tony Mantler	86e9a92c87	am 64bbe34d: am 12866ff1: am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing ... * commit '64bbe34de96b5b4d63e33c08a8484f7946460b5c': Don't assume mHostAuthRecv is loaded when checking outgoing	2014-11-02 19:03:19 +00:00
Tony Mantler	b208347a77	am 35ffcc3a: am bf98b875: am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev ... * commit '35ffcc3a0bed9e59679d978a9d56a0c26c8597a9': Fix handling AOL's login rejection	2014-11-02 19:03:18 +00:00
Baligh Uddin	5117d008c2	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 ... * commit '78d1614ec4ac7d73c9d84ee14a603b0989a1ad0f': Import translations. DO NOT MERGE	2014-11-02 19:03:17 +00:00
Régis Décamps	d42abe0cf8	am 98ceb1d9: am b6785995: am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx ... * commit '98ceb1d9ca8bbe4759744de80869761b459cf8a9': Provider configuration for outlook, yahoo, gmx	2014-11-02 19:03:15 +00:00
Martin Hibdon	c107d01365	am 40b9f3c7: am f0987d36: am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search ... * commit '40b9f3c7df410faf9a836990283f9a2030b23316': Correctly update UI_SYNC_STATUS upon search	2014-11-02 19:03:14 +00:00
Geoff Mendal	f08c63b3c8	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 ... * commit 'b4c0eba750e5b5c1044af06e29d18da47a1d436d': Import translations. DO NOT MERGE	2014-11-02 19:03:13 +00:00
Régis Décamps	e689fb3c66	am 81d5ed1f: am b5e2358f: am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev ... * commit '81d5ed1f1073a4428f7a92f06e612c258390403f': Resend notifications when Accounts are changed	2014-11-02 19:03:12 +00:00
Martin Hibdon	ee82bac726	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 ... * commit 'e8bcbd3159862f07bf53e709221a4d0389e54701': Set mailbox uiSyncStatus when IMAP and POP folders are created	2014-11-02 19:03:10 +00:00
Tony Mantler	774ab0e296	am 5249a10e: am 200adbe9: am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev ... * commit '5249a10e8cc32edd6b93dbd63ae1695629b5b0c3': Reload settings immediately after toggling sync	2014-11-02 19:03:09 +00:00
Tony Mantler	f6524f4c80	am bd9add46: am 22d25e37: am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics ... * commit 'bd9add46f66b717cba786eb99e0aeb43c86d70ea': Initial account setup analytics	2014-11-02 19:03:08 +00:00
Geoff Mendal	1090cd2e69	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 ... * commit '107cacf51e78053178c3c222d7335a45f10e32e4': Import translations. DO NOT MERGE	2014-11-02 19:03:07 +00:00