Martin Hibdon
|
2d488bf43d
|
am 1db58a95: am 2569cfcb: am 2ff1a5cd: am e87b38fa: Merge "Prevent account reconcilliation during migration" into ub-gmail-ur14-dev
* commit '1db58a95beb22f763e2d6fc9f39f936cf4855908':
Prevent account reconcilliation during migration
|
2014-11-02 17:44:18 +00:00 |
Martin Hibdon
|
059c6f36c4
|
am 341c8ef2: am 33ab7b34: am 30d8d696: am 51c65364: Put debug screen back into settings
* commit '341c8ef2eca38c26f9837868b40dedcc47e6b470':
Put debug screen back into settings
|
2014-11-02 17:44:17 +00:00 |
Baligh Uddin
|
0d0d4d2711
|
am 0a7f63e0: (-s ours) am eb3588bc: (-s ours) am 94d76eb9: (-s ours) Import translations. DO NOT MERGE automerge: 1c0aa4c -s ours
* commit '0a7f63e01f8dfed2765867854e4a4f23c2eb0a27':
Import translations. DO NOT MERGE
|
2014-11-02 17:44:16 +00:00 |
Jin Cao
|
81bfcfad16
|
am 5d03847c: am 0b27b809: am 8d6c6348: Should use stateAlwaysHidden for inputmode automerge: aa705e6
* commit '5d03847c3ff543b8d74c98c9e2c76c225d22da4f':
Should use stateAlwaysHidden for inputmode
|
2014-11-02 17:44:15 +00:00 |
Jin Cao
|
b80fea64d0
|
am b0ad7f78: am cdf59599: am b7a5a10d: Merge "input mode to state hidden" into ub-gmail-ur14-dev automerge: e9186cd
* commit 'b0ad7f784bb931fd876770c9004959322497da2c':
input mode to state hidden
|
2014-11-02 17:44:14 +00:00 |
Anthony Lee
|
351e982e23
|
am fb120f7c: am dc952e5d: am 7ef66423: b/17209397. NOOP getServiceMap() if we are in the tombstone app. automerge: 0397e7f
* commit 'fb120f7c2663a58ec12daf06563b1d27add19e94':
b/17209397. NOOP getServiceMap() if we are in the tombstone app.
|
2014-11-02 17:44:13 +00:00 |
Jin Cao
|
b9f425614d
|
am 5b366acf: am ac026ecb: am 0d2f843d: Remove getSuggestionsAuthority automerge: 65c2179
* commit '5b366acf0c6b02fc22af494bf244a490c71e8005':
Remove getSuggestionsAuthority
|
2014-11-02 17:44:11 +00:00 |
Jin Cao
|
292cf3904d
|
am d0a67be9: am a357f81e: am 1991e2a9: Merge "Remove default search for Email" into ub-gmail-ur14-dev automerge: 9ac6ec7
* commit 'd0a67be95098394fbb3fe7a05b13c9e432caff3b':
Remove default search for Email
|
2014-11-02 17:44:10 +00:00 |
Tony Mantler
|
544b00f009
|
am 5a33a789: am c48b9669: am 65bf9945: Fix search mailbox status on early-out when searching automerge: 207a35f
* commit '5a33a7899b9c152c4783ad4b8725d7c7736212f0':
Fix search mailbox status on early-out when searching
|
2014-11-02 17:44:09 +00:00 |
Tony Mantler
|
066c3202dc
|
am 89a36e1d: am ea73ce47: am c71afebb: Fix some AOSP NPEs automerge: 473ce1f
* commit '89a36e1d44249c40420a710336f7eb5fa376b722':
Fix some AOSP NPEs
|
2014-11-02 17:44:08 +00:00 |
Anthony Lee
|
140784ce88
|
am 61a99bbb: am 4f5e86fc: am 982394da: Merge "b/17193866. Update policies when we reconcile." into ub-gmail-ur14-dev automerge: 355e9df
* commit '61a99bbb3bcd64253dc988ab99db9ff49d903d3f':
b/17193866. Update policies when we reconcile.
|
2014-11-02 17:44:06 +00:00 |
Baligh Uddin
|
ce660a6ebb
|
am e19bbf38: (-s ours) am ee7eda0c: (-s ours) am 7e1932f7: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev automerge: 67995a4 -s ours
* commit 'e19bbf3815b3f244f7ebee58ccc1371deca83d13':
Import translations. DO NOT MERGE
|
2014-11-02 17:44:05 +00:00 |
Tony Mantler
|
ae99756ff0
|
am 65911dc2: am 831bb0ab: am b0432334: Match dup accounts against all accounts, not just Email automerge: c1a760b
* commit '65911dc2d2ecb08c7f40e203e8268dc91afc0388':
Match dup accounts against all accounts, not just Email
|
2014-11-02 17:44:04 +00:00 |
Anthony Lee
|
32c3580aee
|
am 4ae25d3b: am ca31da91: am 9d1dc789: b/17135753. Make sure to free ServiceConnection. automerge: 8c65e50
* commit '4ae25d3b4510f3c02709090fb0c6ddf64730ddad':
b/17135753. Make sure to free ServiceConnection.
|
2014-11-02 17:44:01 +00:00 |
Andrew Sapperstein
|
e80fb6cefe
|
am ad1137d1: am ecb6fc31: am 69dda480: Merge "Use appcompat photoviewer." into ub-gmail-ur14-dev automerge: b042013
* commit 'ad1137d1e68b923d310423c66b73c75bb19d6345':
Use appcompat photoviewer.
|
2014-11-02 17:44:00 +00:00 |
Tony Mantler
|
87ff47b6ac
|
am 49c8521d: am 214cf5cf: am e34c3677: Merge "Drawer resource updates" into ub-gmail-ur14-dev automerge: 1e6f26a
* commit '49c8521dbb1415318b5ebbe48e2c72d893c815b9':
Drawer resource updates
Update Notifications (Email)
|
2014-11-02 17:43:58 +00:00 |
Geoff Mendal
|
4301e602d5
|
am 268485ff: (-s ours) am b188964b: (-s ours) am 96ade4e2: (-s ours) Import translations. DO NOT MERGE
* commit '268485ff9268f3bfa6bcb925abf3b117425ed5c2':
Import translations. DO NOT MERGE
|
2014-11-02 17:38:26 +00:00 |
Tony Mantler
|
aee74ef40d
|
am f495b95d: am 67b60f66: am b57bca27: Default to encrypted connections (YAY!)
* commit 'f495b95d7a8ccff42c2fa1eaaa01be713644f2a7':
Default to encrypted connections (YAY!)
|
2014-11-02 17:38:25 +00:00 |
Martin Hibdon
|
7c74d82bc6
|
am ab743fb5: am 0f6acb54: am f0bbcd85: Add additional analytics regarding our SSLSockets
* commit 'ab743fb543424c2e18558881f7264b1a66b6ce2c':
Add additional analytics regarding our SSLSockets
|
2014-11-02 17:38:24 +00:00 |
Martin Hibdon
|
30d6f0460c
|
am 97951159: am 0e1bdee9: am 21dc44d2: Merge "Add analytics to track of what cipher suites are being used" into ub-gmail-ur14-dev
* commit '979511590cafb226edefa6e5219e42d7a1b2cad6':
Add analytics to track of what cipher suites are being used
|
2014-11-02 17:38:23 +00:00 |
Martin Hibdon
|
94190da369
|
am dc6f3aaf: am 85d0fdbe: am 303b553b: Allow an external security provider to be installed
* commit 'dc6f3aafa80c9efbf69f9fdf5b432bcac4832254':
Allow an external security provider to be installed
|
2014-11-02 17:38:22 +00:00 |
Martin Hibdon
|
04b776268b
|
am a67e2212: am be216a96: am a908d45a: Merge "Add deprecated cipher suites to our SSLSocket" into ub-gmail-ur14-dev
* commit 'a67e2212677e5f39085fcdbf1c239075010e4e16':
Add deprecated cipher suites to our SSLSocket
|
2014-11-02 17:38:21 +00:00 |
Anthony Lee
|
cadbc47f79
|
am 4827f0bc: am f85d9e08: am 9d73facf: Merge "Fix restoreBodySource key so it returns the correct value." into ub-gmail-ur14-dev
* commit '4827f0bc4085d44d7524145b22856d78316ebfec':
Fix restoreBodySource key so it returns the correct value.
|
2014-11-02 17:38:19 +00:00 |
Martin Hibdon
|
dedad5ccf7
|
am c0e8417e: am d77bf0c6: am 764d7b2f: Merge "Disable smart foward/reply" into ub-gmail-ur14-dev
* commit 'c0e8417e68a050525e7036f57f23e0b7434e96c8':
Disable smart foward/reply
|
2014-11-02 17:38:18 +00:00 |
Geoff Mendal
|
08fdc12c48
|
am 96815698: (-s ours) am 34418383: (-s ours) am 98f764fb: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit '968156982e6cfeb8fc3ef25f242b05881483eec0':
Import translations. DO NOT MERGE
|
2014-11-02 17:38:17 +00:00 |
Tony Mantler
|
12866ff17e
|
am 0f3a01a4: am 14286249: am d716d894: Don\'t assume mHostAuthRecv is loaded when checking outgoing
* commit '0f3a01a411bee3d106b069d955763d5d5e6cb390':
Don't assume mHostAuthRecv is loaded when checking outgoing
|
2014-11-02 17:38:16 +00:00 |
Tony Mantler
|
bf98b875c2
|
am d82ae435: am 461d3e74: am 1182e1f9: Merge "Fix handling AOL\'s login rejection" into ub-gmail-ur14-dev
* commit 'd82ae435ec246cdfd8010c5f2934906d0247052b':
Fix handling AOL's login rejection
|
2014-11-02 17:38:15 +00:00 |
Baligh Uddin
|
38a40ba654
|
am 8e9d01c9: (-s ours) am 2782b49d: (-s ours) am c2061fb3: (-s ours) Import translations. DO NOT MERGE
* commit '8e9d01c9c3907d0fd7c5db6ab74dc8956827d9b8':
Import translations. DO NOT MERGE
|
2014-11-02 17:38:14 +00:00 |
Régis Décamps
|
b678599530
|
am 53e49db3: am 955b9f96: am d7192f02: Provider configuration for outlook, yahoo, gmx
* commit '53e49db33a52cd1a270f16bc5c2b75d51ef6ffd6':
Provider configuration for outlook, yahoo, gmx
|
2014-11-02 17:38:12 +00:00 |
Martin Hibdon
|
f0987d3603
|
am 9332c48f: am 349e6b91: am f61e098a: Correctly update UI_SYNC_STATUS upon search
* commit '9332c48f563e4972f109cc8f8e6d7f4559665cec':
Correctly update UI_SYNC_STATUS upon search
|
2014-11-02 17:38:11 +00:00 |
Geoff Mendal
|
fe58e8e046
|
am 683ceefa: (-s ours) am feb9d48a: (-s ours) am 58685874: (-s ours) Import translations. DO NOT MERGE
* commit '683ceefaa58a459fdbf49feeacaf1fbaba5e0785':
Import translations. DO NOT MERGE
|
2014-11-02 17:38:10 +00:00 |
Régis Décamps
|
b5e2358fc1
|
am fad80911: am 4ed38cc1: am 2128e365: Merge "Resend notifications when Accounts are changed" into ub-gmail-ur14-dev
* commit 'fad809111cdd90117c2047b9b8625e2ddd9dadf0':
Resend notifications when Accounts are changed
|
2014-11-02 17:38:09 +00:00 |
Martin Hibdon
|
06a3b26964
|
am 1a10b8f7: am e4a62a76: am 7b44fda9: Merge "Set mailbox uiSyncStatus when IMAP and POP folders are created" into ub-gmail-ur14-dev
* commit '1a10b8f790efaa917a619051fad8a09451693767':
Set mailbox uiSyncStatus when IMAP and POP folders are created
|
2014-11-02 17:38:08 +00:00 |
Tony Mantler
|
200adbe935
|
am 14c08377: am 06e38818: am f9757504: Merge "Reload settings immediately after toggling sync" into ub-gmail-ur14-dev
* commit '14c08377e6f5b7b8ce0d604f69bfe3c6ec8ff96f':
Reload settings immediately after toggling sync
|
2014-11-02 17:38:07 +00:00 |
Tony Mantler
|
22d25e3767
|
am 6a9a2f43: am 433f689c: am 1d929d18: Initial account setup analytics
* commit '6a9a2f43e9e732985c3be6c951cfdd0fe43156b2':
Initial account setup analytics
|
2014-11-02 17:38:05 +00:00 |
Geoff Mendal
|
94c660a0bb
|
am fba6f6f3: (-s ours) am 863984a7: (-s ours) am 4012d748: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-gmail-ur14-dev
* commit 'fba6f6f3a1f1884b109cd695c8e250cf4b0156d1':
Import translations. DO NOT MERGE
|
2014-11-02 17:38:03 +00:00 |
Rohan Shah
|
56fd0d48b6
|
am 0fd02688: am d1599a86: am 72f6a243: Revert "Update notification icon asset names (Email)"
* commit '0fd02688716094bebe3a089a10101e17e8ce3d3f':
Revert "Update notification icon asset names (Email)"
|
2014-11-02 17:38:02 +00:00 |
Rohan Shah
|
c33016dc12
|
am 56caa6e1: am bcbe5794: am cc82965a: Update notification icon asset names (Email)
* commit '56caa6e1c1f769d038c570cc255e53e35641e2d3':
Update notification icon asset names (Email)
|
2014-11-02 17:38:00 +00:00 |
Martin Hibdon
|
28230ce5c8
|
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 'd51891fb4c59decaa3b2656683d61a02e3aa1004':
Set the search mailbox's syncState as soon as a search is requested
|
2014-11-02 17:37:59 +00:00 |
Martin Hibdon
|
62318ee61f
|
am f9292376: am 8a99e742: am 89272781: EmailProvider now supports query and getType for cached file urls
* commit 'f9292376a22df42522023653e580ba8b69a6e449':
EmailProvider now supports query and getType for cached file urls
|
2014-11-02 17:37:58 +00:00 |
Tony Mantler
|
92532b1c21
|
am 9d3b1a8d: am 06cc928f: am 1927361b: Merge "Account authentication restyling" into ub-gmail-ur14-dev
* commit '9d3b1a8d0eff6506fbe71b822a22e333f6cd5002':
Account authentication restyling
|
2014-11-02 17:37:56 +00:00 |
Régis Décamps
|
f24a5de95b
|
am d606e825: am f62b6843: am 8c0253a1: Merge "Replace "Corporate" by "Exchange"." into ub-gmail-ur14-dev
* commit 'd606e825211be26d0bddd80544d05f9fe9dd654c':
Replace "Corporate" by "Exchange".
|
2014-11-02 17:37:55 +00:00 |
Tony Mantler
|
2b39de91bd
|
am 815252ad: am 31966801: am 746dcf06: Merge "Restyle account setup flow nav buttons" into ub-gmail-ur14-dev
* commit '815252ad3d50c0e3855e3dfa4cd736becad6af86':
Restyle account setup flow nav buttons
|
2014-11-02 17:37:54 +00:00 |
Geoff Mendal
|
813b5b9d78
|
am f3a519c2: (-s ours) am d7063821: (-s ours) am 2a1daaae: (-s ours) Import translations. DO NOT MERGE
* commit 'f3a519c22bd5c5e249451fced163af599d2ec9e4':
Import translations. DO NOT MERGE
|
2014-11-02 17:37:53 +00:00 |
Baligh Uddin
|
037c43569e
|
am 8182d3a7: (-s ours) am a3bfe727: (-s ours) am ab3ed2cb: (-s ours) Import translations. DO NOT MERGE
* commit '8182d3a77d81fee4f2697e98891582260cf8afbb':
Import translations. DO NOT MERGE
|
2014-11-02 17:37:52 +00:00 |
Martin Hibdon
|
b8209a4c6a
|
am c7d52321: am 9ef12d1b: am 46f1b89f: Merge "Get SSLSocketFactory from GmsCore" into ub-gmail-ur14-dev
* commit 'c7d52321bc2b882d04923204db5f1270e24c6bc8':
Get SSLSocketFactory from GmsCore
|
2014-11-02 17:37:51 +00:00 |
Anthony Lee
|
82319a9867
|
am 468a0417: am c95714b3: am ec8c2ac9: Merge "Calculate available background threads for AttachmentService correctly." into ub-gmail-ur14-dev
* commit '468a0417dd57e64f079202252028583148fafb94':
Calculate available background threads for AttachmentService correctly.
|
2014-11-02 17:37:50 +00:00 |
Rohan Shah
|
93a6c2c36a
|
am 80f4af5a: am cf3aad64: am 42a4f201: Move Email Icons (Email)
* commit '80f4af5a15683d3e10806d9fc0573edcca812662':
Move Email Icons (Email)
|
2014-11-02 17:37:49 +00:00 |
Rohan Shah
|
2df883ac09
|
am 3884149d: am a7d316c4: am 083a0138: Merge "Update Email Icons" into ub-gmail-ur14-dev
* commit '3884149d7c1c155ff9b454b185a78092e646d447':
Update Email Icons
|
2014-11-02 17:37:48 +00:00 |
Rohan Shah
|
9486b7512e
|
am 6cef32da: am a4b5463d: am 36830d42: Merge "Revert "Clean-up Email Icons"" into ub-gmail-ur14-dev
* commit '6cef32da6f660d5f6276c93daf929c74610b4603':
Revert "Clean-up Email Icons"
|
2014-11-02 17:37:47 +00:00 |