summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix task stack building on ICSIsaac Katzenelson2012-06-183-10/+6
* Temporary fix to crash in notification on ICSIsaac Katzenelson2012-06-121-0/+2
* am 8f65224f: (-s ours) am 3822f964: Import translations. DO NOT MERGEEric Fischer2012-06-110-0/+0
|\
| * am 3822f964: Import translations. DO NOT MERGEEric Fischer2012-06-112-2/+2
| |\
| | * Import translations. DO NOT MERGEEric Fischer2012-06-112-2/+2
* | | Import translations. DO NOT MERGEEric Fischer2012-06-112-2/+2
* | | am 0bbb5127: Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
|\| |
| * | Reconcile with jb-releaseThe Android Open Source Project2012-06-070-0/+0
| |\ \
| | * \ merge in jb-release history after reset to jb-devThe Android Automerger2012-06-060-0/+0
| | |\ \ | | | |/ | | |/|
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-050-0/+0
| | | |\
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-030-0/+0
| | | | |\
| | | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-05-310-0/+0
| | | | | |\
* | | | | | | am 46cc3d52: am c334a20c: Merge "Fix event info buttons size" into jb-devIsaac Katzenelson2012-06-0520-73/+24
|\| | | | | |
| * | | | | | am c334a20c: Merge "Fix event info buttons size" into jb-devIsaac Katzenelson2012-06-0520-73/+24
| |\| | | | |
| | * | | | | Merge "Fix event info buttons size" into jb-devIsaac Katzenelson2012-06-0520-73/+24
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix event info buttons sizeIsaac Katzenelson2012-06-0420-73/+24
| | | |/ / /
* | | | | | am 5e84ce3d: (-s ours) am b3921b9c: Import translations. DO NOT MERGEEric Fischer2012-06-050-0/+0
|\| | | | |
| * | | | | am b3921b9c: Import translations. DO NOT MERGEEric Fischer2012-06-043-5/+3
| |\| | | |
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-5/+3
* | | | | | Import translations. DO NOT MERGEEric Fischer2012-06-043-5/+3
* | | | | | am 3472d3ef: am c077ec06: Fix crash in EditEvent when attendee email is null.Isaac Katzenelson2012-06-041-3/+1
|\| | | | |
| * | | | | am c077ec06: Fix crash in EditEvent when attendee email is null.Isaac Katzenelson2012-06-041-3/+1
| |\| | | |
| | * | | | Fix crash in EditEvent when attendee email is null.Isaac Katzenelson2012-06-041-3/+1
| | |/ / /
* | | | | Make notifications code ICS compatible.Sara Ting2012-06-049-116/+132
* | | | | am e5142a18: am 2fd42e77: Merge "Change popup notification to show AlertActiv...Sara Ting2012-06-021-6/+10
|\| | | |
| * | | | am 2fd42e77: Merge "Change popup notification to show AlertActivity." into jb...Sara Ting2012-06-021-6/+10
| |\| | |
| | * | | Merge "Change popup notification to show AlertActivity." into jb-devSara Ting2012-06-021-6/+10
| | |\ \ \
| | | * | | Change popup notification to show AlertActivity.Sara Ting2012-05-311-6/+10
| | | |/ /
* | | | | am a8a820a6: (-s ours) am 2f72747f: Import translations. DO NOT MERGEEric Fischer2012-06-010-0/+0
|\| | | |
| * | | | am 2f72747f: Import translations. DO NOT MERGEEric Fischer2012-06-0117-34/+17
| |\| | |
| | * | | Import translations. DO NOT MERGEEric Fischer2012-06-0117-34/+17
* | | | | Import translations. DO NOT MERGEEric Fischer2012-06-0117-34/+17
* | | | | Merge "Modify app so it will run in ICS MR1"Michael Chan2012-05-3112-22/+73
|\ \ \ \ \
| * | | | | Modify app so it will run in ICS MR1Michael Chan2012-05-3112-22/+73
* | | | | | am da3cd259: (-s ours) am e5e52d28: Import translations. DO NOT MERGEEric Fischer2012-05-310-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am e5e52d28: Import translations. DO NOT MERGEEric Fischer2012-05-319-20/+14
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Import translations. DO NOT MERGEEric Fischer2012-05-319-20/+14
| | | |/ / | | |/| |
* | | | | Merge "Import translations. DO NOT MERGE"Eric Fischer2012-05-319-20/+14
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Import translations. DO NOT MERGEEric Fischer2012-05-319-20/+14
* | | | | Revert "Modify app so it will run in ICS MR1"Michael Chan2012-05-3112-73/+24
* | | | | Modify app so it will run in ICS MR1Michael Chan2012-05-3112-24/+73
|/ / / /
* | | | am 516284c0: am 4d0d2f58: Merge "Fix dismissing all notifications." into jb-devSara Ting2012-05-302-7/+7
|\| | |
| * | | am 4d0d2f58: Merge "Fix dismissing all notifications." into jb-devSara Ting2012-05-302-7/+7
| |\| |
| | * | Merge "Fix dismissing all notifications." into jb-devSara Ting2012-05-302-7/+7
| | |\ \
| | | * | Fix dismissing all notifications.Sara Ting2012-05-302-7/+7
* | | | | Merge "Fix goto in multi day event"Isaac Katzenelson2012-05-305-69/+141
|\ \ \ \ \
| * | | | | Fix goto in multi day eventIsaac Katzenelson2012-05-305-69/+141
* | | | | | am acf9b611: am a9ceea4f: Merge "Fix up-back for Settings." into jb-devSara Ting2012-05-301-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am a9ceea4f: Merge "Fix up-back for Settings." into jb-devSara Ting2012-05-301-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Fix up-back for Settings." into jb-devSara Ting2012-05-301-1/+1
| | |\ \ \ \