Commit Graph

13408 Commits

Author SHA1 Message Date
Baligh Uddin
f44b729bff Import translations. DO NOT MERGE
Change-Id: Iee475d633f006f42885e481ed819ac8cb2c86420
Auto-generated-cl: translation import
2014-10-30 15:50:02 -07:00
Baligh Uddin
b9afdc2125 am 4b6f2e7a: (-s ours) Import translations. DO NOT MERGE
* commit '4b6f2e7a38c83c9bfa368c8aedef1cb5d91b7c8b':
  Import translations. DO NOT MERGE
2014-10-20 00:29:34 +00:00
Baligh Uddin
4b6f2e7a38 Import translations. DO NOT MERGE
Change-Id: I7dccf29ecb1954edcaf288ff4467e6aee2d29c15
Auto-generated-cl: translation import
2014-10-19 16:11:30 -07:00
Baligh Uddin
edbb115ef3 am bf868306: (-s ours) Import translations. DO NOT MERGE
* commit 'bf8683067bbffefa2fe4eb2b00811dcab41c693b':
  Import translations. DO NOT MERGE
2014-09-29 20:45:52 +00:00
Baligh Uddin
bf8683067b Import translations. DO NOT MERGE
Change-Id: Ifec0071ffe7e247f0fc4f0fecdef145713949382
Auto-generated-cl: translation import
2014-09-28 19:49:26 -07:00
Baligh Uddin
0983ec6aee am bc75e98d: (-s ours) am 611475df: (-s ours) Import translations. DO NOT MERGE
* commit 'bc75e98d5919ddfe1e891accbd218bb3f1b4e0d8':
  Import translations. DO NOT MERGE
2014-09-15 03:08:15 +00:00
Baligh Uddin
bc75e98d59 am 611475df: (-s ours) Import translations. DO NOT MERGE
* commit '611475df609bbbd9c515313658ba41ceaa20047b':
  Import translations. DO NOT MERGE
2014-09-15 02:51:40 +00:00
Baligh Uddin
611475df60 Import translations. DO NOT MERGE
Change-Id: Iafae6db0a11334dea0250f45ca01649db03902e4
Auto-generated-cl: translation import
2014-09-14 18:42:37 -07:00
Baligh Uddin
0cad8a526e am d078b84c: (-s ours) am 16ce4097: (-s ours) Import translations. DO NOT MERGE
* commit 'd078b84c33d331c7535068eea079cae6a7c6049b':
  Import translations. DO NOT MERGE
2014-09-11 15:52:25 +00:00
Baligh Uddin
d078b84c33 am 16ce4097: (-s ours) Import translations. DO NOT MERGE
* commit '16ce409730a82666ef53303884e56b39fd0c6332':
  Import translations. DO NOT MERGE
2014-09-11 15:38:59 +00:00
Baligh Uddin
16ce409730 Import translations. DO NOT MERGE
Change-Id: I9d37015bcfe0ab83750ebe2e9d2a31b3e5933f3b
Auto-generated-cl: translation import
2014-09-08 10:30:58 -07:00
Baligh Uddin
6e14e88ba9 am 77706cfb: (-s ours) am 4adaa34b: (-s ours) am e6b9a3aa: (-s ours) am 3dc73b33: (-s ours) Import translations. DO NOT MERGE
* commit '77706cfb25acf22b7259d335ea7e719672a8ac46':
  Import translations. DO NOT MERGE
2014-08-26 04:54:24 +00:00
Baligh Uddin
77706cfb25 am 4adaa34b: (-s ours) am e6b9a3aa: (-s ours) am 3dc73b33: (-s ours) Import translations. DO NOT MERGE
* commit '4adaa34bd5ef67f0d73a80258a8f6098c8e4c0fb':
  Import translations. DO NOT MERGE
2014-08-25 22:18:00 +00:00
Baligh Uddin
4adaa34bd5 am e6b9a3aa: (-s ours) am 3dc73b33: (-s ours) Import translations. DO NOT MERGE
* commit 'e6b9a3aa1e104ea1526e8b9fef4d8b14689c05aa':
  Import translations. DO NOT MERGE
2014-08-25 22:07:18 +00:00
Baligh Uddin
5a1a04b7cd am 55e1d9c2: (-s ours) am fbbba843: (-s ours) Import translations. DO NOT MERGE
* commit '55e1d9c2d73f53e0c0b54097314b2aa747516643':
  Import translations. DO NOT MERGE
2014-08-25 16:25:04 +00:00
Qiwen Zhao
8a137846cc am d6f7cdf4: am c0977c85: (-s ours) reset to ub-mail-master-release at 1235730
* commit 'd6f7cdf4c7e19a2e8ecc01f345111ce2f82c459b':
2014-08-25 16:25:03 +00:00
Baligh Uddin
55e1d9c2d7 am fbbba843: (-s ours) Import translations. DO NOT MERGE
* commit 'fbbba843026328dc1ebed5086ad30b6a173791be':
  Import translations. DO NOT MERGE
2014-08-25 16:18:18 +00:00
Qiwen Zhao
d6f7cdf4c7 am c0977c85: (-s ours) reset to ub-mail-master-release at 1235730
* commit 'c0977c85804623c2407fff419a69b5524cadc357':
2014-08-25 16:18:18 +00:00
Baligh Uddin
fbbba84302 Import translations. DO NOT MERGE
Change-Id: Ic2c6080e9372b706f00f60742ba55fe2f8832da8
Auto-generated-cl: translation import
2014-08-24 08:54:25 -07:00
Baligh Uddin
e6b9a3aa1e am 3dc73b33: (-s ours) Import translations. DO NOT MERGE
* commit '3dc73b331fda1b51a95a8ca33b3d6745dbe24ff2':
  Import translations. DO NOT MERGE
2014-08-22 17:16:25 +00:00
Baligh Uddin
3dc73b331f Import translations. DO NOT MERGE
Change-Id: Id9003bae28588686dc142bc6eb59697b7d25cea9
Auto-generated-cl: translation import
2014-08-22 09:40:58 -07:00
Qiwen Zhao
7c05913c21 am 2a28a581: reset to sha1 1235730 with history
* commit '2a28a581bf82aa5e988142e3e21b82d2f6dee397':
2014-08-21 02:56:19 +00:00
Qiwen Zhao
254afb61d1 reset to 1235730 with history 2014-08-20 15:06:31 -07:00
Qiwen Zhao
2a28a581bf reset to sha1 1235730 with history 2014-08-20 14:47:42 -07:00
The Android Automerger
c9f774719c am 1235730a: merge in ub-mail-master-release history after reset to fc67cb019c
* commit '1235730a4734bf0413cbad58e054096e00b50585':
  Skip null/empty account types
2014-08-20 21:28:06 +00:00
Paul Westbrook
af9f2aeeb6 am fc67cb01: am 1371dd99: Change method signature
* commit 'fc67cb019c2a6b97af6086c66be643406205e1c9':
  Change method signature
2014-08-20 21:28:04 +00:00
Tony Mantler
13bb18c2cd am 3f32ffd7: am f4b55c8e: Merge "Fix folder sync settings for tablet" into ub-gmail-ur14-dev
* commit '3f32ffd75912243e0dfdef0d65dd0bbb4248e8f9':
  Fix folder sync settings for tablet
2014-08-20 21:28:02 +00:00
Rohan Shah
893700ff2d am 14e1d8ac: am 3984736f: Merge "Fix FolderSelectionActivity Issue (Widget)" into ub-gmail-ur14-dev
* commit '14e1d8ac9689c02908bf2819eb1e037eb0ee44d6':
  Fix FolderSelectionActivity Issue (Widget)
2014-08-20 21:28:00 +00:00
Rohan Shah
6623c7c266 am 3fd0cbaa: am a8a185f7: Merge "Update Notifications Icon (Email)" into ub-gmail-ur14-dev
* commit '3fd0cbaa917f16261e7598c8705a924a5187090d':
  Update Notifications Icon (Email)
2014-08-20 21:27:59 +00:00
Tony Mantler
1896fa85c9 am 2d109f4f: am 486e9710: Fix providers.xml alternate diversion
* commit '2d109f4f9383341caa2d11e74cdf89f6faf5cbbd':
  Fix providers.xml alternate diversion
2014-08-20 21:27:58 +00:00
Baligh Uddin
203a79d3a3 am b9287b8a: (-s ours) am 6d165bca: (-s ours) Import translations. DO NOT MERGE
* commit 'b9287b8a781cdccf5ffea589b98bd12c58e0cd1b':
  Import translations. DO NOT MERGE
2014-08-20 21:27:57 +00:00
Baligh Uddin
a29d2ad1eb am 568de310: (-s ours) am ea99a057: (-s ours) Import translations. DO NOT MERGE
* commit '568de310b6792ea11560ebbea6d67b0a0d1b7cf8':
  Import translations. DO NOT MERGE
2014-08-20 21:27:56 +00:00
James Lemieux
36478c8ca8 am fcc60209: am 66ff95a5: Merge "End of Life screen for Email" into ub-gmail-ur14-dev
* commit 'fcc602092456d54b6f851e987f2983360dd126c5':
  End of Life screen for Email
2014-08-20 21:27:55 +00:00
Rohan Shah
2f59ad6ec8 am c453deee: am 7941b406: Update Notifications (Email)
* commit 'c453deeefcd77cebc51f398394c8b6156e99a0e1':
  Update Notifications (Email)
2014-08-20 21:27:54 +00:00
Tony Mantler
bfd1be2c6e am df1a68eb: am 43106e9d: Merge "Extend MailboxSettings to handle full folder list" into ub-gmail-ur14-dev
* commit 'df1a68ebd07b0912091a7f78e3428ef5d179c90a':
  Extend MailboxSettings to handle full folder list
2014-08-20 21:27:53 +00:00
Martin Hibdon
0f95edfcc2 am cd267c47: am 80982db3: Update email version number
* commit 'cd267c4744ad69ce592b014e5b1bbb96243169ed':
  Update email version number
2014-08-20 21:27:52 +00:00
Tony Mantler
f7ebff96cd am 5a8065ef: am ca02ab31: Don\'t export MailboxSettings
* commit '5a8065ef11d022d9a3d1292def7654756b010747':
  Don't export MailboxSettings
2014-08-20 21:27:41 +00:00
Baligh Uddin
352c13f6af am e29403d7: (-s ours) am a780beb0: (-s ours) Import translations. DO NOT MERGE
* commit 'e29403d7c88842ae885860c54500a0bdd4175601':
  Import translations. DO NOT MERGE
2014-08-20 21:27:40 +00:00
Baligh Uddin
a47009470d am 7ae1a977: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-master
* commit '7ae1a977d3335609a7c3278a4ee3f9cdbe8b98b9':
  Import translations. DO NOT MERGE
2014-08-20 21:27:39 +00:00
Martin Hibdon
3a7e664e73 am 2fc57a8b: Update email version number
* commit '2fc57a8bac1a47f47343ed95f0d8a77549615140':
  Update email version number
2014-08-20 21:27:38 +00:00
Tony Mantler
5063c85116 am 2cdb08d4: am ea0c4007: Use margin instead of padding to work around ICS/JB bug
* commit '2cdb08d4944f279e2eab78bb06d39210c3b9588a':
  Use margin instead of padding to work around ICS/JB bug
2014-08-20 21:27:37 +00:00
Baligh Uddin
c4a44f5d4b am 1a127a98: (-s ours) am 5a564d6a: (-s ours) am 3c16f24b: (-s ours) Import translations. DO NOT MERGE
* commit '1a127a9806fe2d11c82076a7916142909fbc3b9b':
2014-08-20 21:27:36 +00:00
Baligh Uddin
49945eafea am 8564c78e: (-s ours) am 3c16f24b: (-s ours) Import translations. DO NOT MERGE
* commit '8564c78e5dc020266137db71aefbed697420b5d6':
  Import translations. DO NOT MERGE
2014-08-20 21:27:35 +00:00
Tony Mantler
f18ca4aa66 am b3e36605: am 0c4f45e8: Add chromium.org to providers.xml
* commit 'b3e36605ac149eac7514930f6ecc11f94b026829':
  Add chromium.org to providers.xml
2014-08-20 21:27:34 +00:00
Tony Mantler
cc19ead675 am 428ebd72: am 4c865846: Don\'t return a protocol for a null account type
* commit '428ebd7260f0fef408b1391d93aec26976528dcb':
  Don't return a protocol for a null account type
2014-08-20 21:27:33 +00:00
Tony Mantler
5d0bbdf46a am 67f497c6: am f1789afa: Switch null checks to TextUtils.isEmpty()
* commit '67f497c634e5d89b4450eff8c0ba1311b4829216':
  Switch null checks to TextUtils.isEmpty()
2014-08-20 21:27:32 +00:00
Anthony Lee
a528ad3946 am 96f8d2ac: am 8218d006: Merge "Make sure that we close the cursor." into ub-gmail-ur14-dev
* commit '96f8d2accda319da5c8026395fcf1c5e9cf11efb':
  Make sure that we close the cursor.
2014-08-20 21:27:31 +00:00
Tony Mantler
dd4aec40db am f0deafc8: am 1381d408: Skip null/empty account types
* commit 'f0deafc8162ba87f15b1a6f6531e29ee57b4b5df':
  Skip null/empty account types
2014-08-20 21:27:30 +00:00
Régis Décamps
17ba6a96af am 191937b6: am 34aae3cb: Merge "Fix getAllAmAccounts() returning duplicated accounts" into ub-gmail-ur14-dev
* commit '191937b69db3162647851966ecedb28f93a7922b':
  Fix `getAllAmAccounts()` returning duplicated accounts
2014-08-20 21:27:29 +00:00
Paul Westbrook
6cb0455771 am 222e8255: am e76b7bbf: Fix proguard rule
* commit '222e8255b15735bb0325b388430b2b237c396386':
  Fix proguard rule
2014-08-20 21:27:28 +00:00