summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "email: allow to remove an email account" into cm-11.0cm-11.0-XNPH33R-bacon-3628510d76cm-11.0-XNPH30O-bacon-4f280f505aJorge Ruesga2014-06-303-1/+111
|\
| * email: allow to remove an email accountJorge Ruesga2014-06-273-1/+111
* | Automatic translation importMichael Bestas2014-06-301-0/+27
* | Automatic translation importMichael Bestas2014-06-293-0/+69
|/
* Automatic translation importMichael Bestas2014-06-223-295/+34
* Automatic translation importMichael Bestas2014-06-211-0/+23
* Automatic translation importMichael Bestas2014-06-121-2/+2
* Merge tag 'android-4.4.3_r1' into HEADRicardo Cerqueira2014-06-04110-11886/+1304
|\
| * Restore xxxhdpi icons.Yu Ping Hu2014-03-272-0/+0
| * Import translations. DO NOT MERGEBaligh Uddin2014-03-246-14/+14
| * keep history after reset to ub-mail-klp-mr2-release@1078484Baligh Uddin2014-03-200-0/+0
| |\
| | * Import translations. DO NOT MERGEBaligh Uddin2014-02-202-2/+2
| | * Import translations. DO NOT MERGEBaligh Uddin2014-01-061-4/+4
| | * am 6953d595: Null check service infoTony Mantler2013-11-191-1/+3
| | |\
| * | \ merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-03-170-0/+0
| |\ \ \
| | * \ \ merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-03-100-0/+0
| | |\ \ \
| | | * | | Increment version.Yu Ping Hu2014-03-061-1/+1
| | | * | | Increment version.Yu Ping Hu2014-03-051-1/+1
| | | * | | merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-03-040-0/+0
| | | |\ \ \
| | | | * \ \ merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-02-270-0/+0
| | | | |\ \ \
| | | | | * \ \ merge in ub-mail-klp-mr2-release history after reset to ub-mail-klp-mr2The Android Automerger2014-02-270-0/+0
| | | | | |\ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | | * | Merge "Fix sync window preference being added multiple times" into ub-mail-ma...Tony Mantler2014-02-271-4/+7
| | | | | | |\ \
| | | | | | | * | Fix sync window preference being added multiple timesTony Mantler2014-02-261-4/+7
| | | | | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-02-2656-2/+114
| | | | | | * | | Merge "Fix IMAP delete handling" into ub-mail-masterTony Mantler2014-02-261-11/+30
| | | | | | |\ \ \
| | | | | | | * | | Fix IMAP delete handlingTony Mantler2014-02-241-11/+30
| | | | | | | |/ /
| | | | | | * | | Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-02-257-26/+14
| | | | | | |\ \ \
| | | | | | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-02-247-26/+14
| | | | | | | |/ /
| | | | | | * | | Merge "Update the title for the oauth authentication screen" into ub-mail-masterMartin Hibdon2014-02-241-1/+1
| | | | | | |\ \ \ | | | | | | | |/ / | | | | | | |/| |
| | | | | | | * | Update the title for the oauth authentication screenMartin Hibdon2014-02-201-1/+1
| | | | | | * | | Merge "Quit dropping inline attachments on the floor" into ub-mail-masterTony Mantler2014-02-212-0/+14
| | | | | | |\ \ \
| | | | | | | * | | Quit dropping inline attachments on the floorTony Mantler2014-02-212-0/+14
| | | | | | * | | | Fix testsTony Mantler2014-02-212-1/+3
| | | | | | |/ / /
| | | | | | * | | Add a placeholder flaky test.Brett Chabot2014-02-201-0/+30
| | | | | | * | | Convert Email tests to use android-support-testsBrett Chabot2014-02-203-43/+3
| | | | | | * | | Merge "Fix temporary setup flow on tablets" into ub-mail-masterMartin Hibdon2014-02-202-24/+16
| | | | | | |\| |
| | | | | | | * | Fix temporary setup flow on tabletsMartin Hibdon2014-02-202-24/+16
| | | | | | * | | am ecbdb2e3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | | | | | |\ \ \
| | | | | | | * | | Import translations. DO NOT MERGEBaligh Uddin2014-02-202-2/+2
| | | | | | * | | | am eebefdbc: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2014-02-200-0/+0
| | | | | | |\ \ \ \
| | | | | | | * | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-202-2/+2
| | | | | | * | | | | Merge "Import translations. DO NOT MERGE" into ub-mail-masterBaligh Uddin2014-02-2056-168/+152
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-02-2056-168/+152
| | | | | | * | | | | | Add @SmallTest annotation to test classes so they get run in continuousJerry Xie2014-02-1912-0/+26
| | | | | | * | | | | | Merge "Fix some broken tests" into ub-mail-masterMartin Hibdon2014-02-202-10/+5
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | | | |
| | | | | | | * | | | | Fix some broken testsMartin Hibdon2014-02-192-10/+5
| | | | | | | | |_|/ / | | | | | | | |/| | |
| | | | | | * | | | | Merge "Fix unbounded async task creation in ADS" into ub-mail-masterTony Mantler2014-02-191-15/+42
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / / | | | | | | |/| | | |
| | | | | | | * | | | Fix unbounded async task creation in ADSTony Mantler2014-02-191-15/+42
| | | | | | * | | | | Merge "Update version number" into ub-mail-masterMartin Hibdon2014-02-191-1/+1
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | Update version numberMartin Hibdon2014-02-191-1/+1