summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-250-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-03-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * am 95e9538c: Fix for "Fragment already added" exceptionJames Kung2013-03-205-2/+11
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Redisabling Calendar app for limited usersSean Abraham2013-06-071-2/+3
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2013-06-051-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 61388102: Calendar color picker Exchange account fixJames Kung2013-05-316-15/+207
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calendar color picker Exchange account fixJames Kung2013-05-306-15/+207
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-271-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bf9282ec: Add a dummy file to assetsIsaac Katzenelson2013-05-231-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a dummy file to assetsIsaac Katzenelson2013-05-221-0/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-201-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0a77d682: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-...Baligh Uddin2013-05-170-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denimBaligh Uddin2013-05-177-13/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-177-13/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-177-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-177-13/+13
| | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 497a6259: No crash on color change and orientation changeJames Kung2013-05-171-8/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / No crash on color change and orientation changeJames Kung2013-05-171-8/+10
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | / / / / / / / / / / / / / / / / / / / / / / / / / / / / / am 9662675d: Merge "Query for Colors in parallel with all other queries" into...Isaac Katzenelson2013-05-141-4/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Query for Colors in parallel with all other queries" into ics-ub-calen...Isaac Katzenelson2013-05-141-4/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Query for Colors in parallel with all other queriesIsaac Katzenelson2013-05-131-4/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3f0521e9: Merge "Fix for interval strings beginning with the count" into i...James Kung2013-05-131-8/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix for interval strings beginning with the count" into ics-ub-calenda...James Kung2013-05-131-8/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for interval strings beginning with the countJames Kung2013-05-131-8/+4
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am d37fa4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into ics-ub-...Baligh Uddin2013-05-130-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denimBaligh Uddin2013-05-1322-62/+62
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-1322-62/+62
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-1322-62/+62
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-1322-62/+62
| | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8f0d70bf: Merge "Solution for recurrence spinner issues" into ics-ub-calen...James Kung2013-05-133-32/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Solution for recurrence spinner issues" into ics-ub-calendar-denimJames Kung2013-05-133-32/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solution for recurrence spinner issuesJames Kung2013-05-103-32/+16
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1c52e5ef: (-s ours) am 52b8824a: (-s ours) Merge "Reformat timezone name t...Isaac Katzenelson2013-05-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 52b8824a: (-s ours) Merge "Reformat timezone name to better distinguish GM...Isaac Katzenelson2013-05-100-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Reformat timezone name to better distinguish GMT from timezone. DO NOT...Isaac Katzenelson2013-05-062-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGESam Blitzstein2013-05-042-3/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bdaaee94: (-s ours) am 3a1b3030: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3a1b3030: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-063-3/+3
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am ff9d22d6: (-s ours) am b3f4b48e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b3f4b48e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-0327-77/+121
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am bfb9f78a: (-s ours) am a2dc0a70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a2dc0a70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2013-05-100-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-0174-224/+372
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 7ecf7983: spawn a worker thread in onReceive.Chris Wren2013-05-091-29/+40
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spawn a worker thread in onReceive.Chris Wren2013-05-091-29/+40
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-05-093-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-05-083-5/+5
| | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |