summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-06-11merge in jb-mr2-zeroday-release history after reset to jb-mr2-devandroid-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2jb-mr2.0-releaseThe Android Automerger
2013-06-09merge in jb-mr2-zeroday-release history after reset to jb-mr2-devThe Android Automerger
2013-06-07Redisabling Calendar app for limited usersandroid-4.3_r3.1android-4.3_r3android-4.3.1_r1jb-mr2.0.0-releasejb-mr2-devSean Abraham
Bug: 9295790 Change-Id: I871815ca327b7aa669aaff3b762325dd1502c19b
2013-06-05Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ia90c28c0122f79d562fb14c51ccce0c43118859e Auto-generated-cl: translation import
2013-06-02merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-31am 61388102: Calendar color picker Exchange account fixJames Kung
* commit '61388102bec5243dfd4494b8c674cdb7957663a6': Calendar color picker Exchange account fix
2013-05-30Calendar color picker Exchange account fixJames Kung
Bug: 9196777 Change-Id: I21c97bf06ab51254d816f7c5cc2817f85e91d2eb
2013-05-30merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-27Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Ic857bd6763a14e1bbf1b42fe6298399ba1d05f78 Auto-generated-cl: translation import
2013-05-26merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-23am bf9282ec: Add a dummy file to assetsIsaac Katzenelson
* commit 'bf9282ec18169524b011c29d0e79ab78a78e62b3': Add a dummy file to assets
2013-05-22Add a dummy file to assetsIsaac Katzenelson
Bug: 9087745 Dummy files makes the build system include the timezone data files since they are a symlink to the real files and the build system ignores them. Change-Id: Ifd7bbe3abca180ef7580a5c2ed68849705c57f82
2013-05-21merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-20Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I6ebdf55cb87b02dd8aa9c810dcd8344d4fc33bbd Auto-generated-cl: translation import
2013-05-19merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-17am 0a77d682: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin
ics-ub-calendar-denim * commit '0a77d682376df881bced0ff203559ca05e6df415': Import translations. DO NOT MERGE
2013-05-17Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denimBaligh Uddin
2013-05-17Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin
2013-05-17am 497a6259: No crash on color change and orientation changeJames Kung
* commit '497a6259757e4b61ef8f15aa516284d5b0ac3451': No crash on color change and orientation change
2013-05-17Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I9feeb812a98388de0e71a066241205b06441553f Auto-generated-cl: translation import
2013-05-17Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Iad22d64def28a7a71ad9c3cfb745c4a530d10548 Auto-generated-cl: translation import
2013-05-17No crash on color change and orientation changeJames Kung
Bug: 9005546 Change-Id: I0830d4dd9fbbeaa9f79c9295eb5dd7bad70d979b
2013-05-14merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-14am 9662675d: Merge "Query for Colors in parallel with all other queries" ↵Isaac Katzenelson
into ics-ub-calendar-denim * commit '9662675dc0765ab347d1786e3d5a86ce9f3f5b84': Query for Colors in parallel with all other queries
2013-05-14Merge "Query for Colors in parallel with all other queries" into ↵Isaac Katzenelson
ics-ub-calendar-denim
2013-05-14merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-13Query for Colors in parallel with all other queriesIsaac Katzenelson
Bug: 8945406 When the data queried for editing an event is not done squentially there is a timing issue that causes the view to lose the focus and the IME. Changed the queries to start all in parallel. Change-Id: Id592d7f1ae0f27717275288a661d5938c0a4f485
2013-05-13am 3f0521e9: Merge "Fix for interval strings beginning with the count" into ↵James Kung
ics-ub-calendar-denim * commit '3f0521e93a94ac7fb927926ef3eab410bd6c83e3': Fix for interval strings beginning with the count
2013-05-13Merge "Fix for interval strings beginning with the count" into ↵James Kung
ics-ub-calendar-denim
2013-05-13Fix for interval strings beginning with the countJames Kung
Bug: 8895602 Change-Id: I07996e0dfaebfa73b5e61040d9848c09858e763d
2013-05-13am d37fa4c9: (-s ours) Merge "Import translations. DO NOT MERGE" into ↵Baligh Uddin
ics-ub-calendar-denim * commit 'd37fa4c93a821ff1ecf878ed1feb0f1af3c70d79': Import translations. DO NOT MERGE
2013-05-13Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin
2013-05-13Merge "Import translations. DO NOT MERGE" into ics-ub-calendar-denimBaligh Uddin
2013-05-13Import translations. DO NOT MERGEBaligh Uddin
Change-Id: Idc2f94defdbf574389a57ec79224169a70019d82 Auto-generated-cl: translation import
2013-05-13Import translations. DO NOT MERGEBaligh Uddin
Change-Id: I61798722abf83903ae2170c479436324020f6c35 Auto-generated-cl: translation import
2013-05-13am 8f0d70bf: Merge "Solution for recurrence spinner issues" into ↵James Kung
ics-ub-calendar-denim * commit '8f0d70bfa2e4595a4f5f74be80de106411ea140a': Solution for recurrence spinner issues
2013-05-13Merge "Solution for recurrence spinner issues" into ics-ub-calendar-denimJames Kung
2013-05-13merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger
2013-05-10Solution for recurrence spinner issuesJames Kung
Bug: 8895602 Change-Id: I22b71def459fe8fc9ccf6b60144a5341d4db4655
2013-05-10am 1c52e5ef: (-s ours) am 52b8824a: (-s ours) Merge "Reformat timezone name ↵Isaac Katzenelson
to better distinguish GMT from timezone. DO NOT MERGE" into ics-ub-calendar-cream * commit '1c52e5ef49f2a6e5391a24dbed93c5fa5fb22084': Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGE
2013-05-10am bdaaee94: (-s ours) am 3a1b3030: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'bdaaee94274ff09f5a45f744c91e45f4388882fc': Import translations. DO NOT MERGE
2013-05-10am ff9d22d6: (-s ours) am b3f4b48e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'ff9d22d62717c615ae6af0c52a31f79460084286': Import translations. DO NOT MERGE
2013-05-10am bfb9f78a: (-s ours) am a2dc0a70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'bfb9f78a9b502c835d056817dfe303f77ca4a6b5': Import translations. DO NOT MERGE
2013-05-10am 52b8824a: (-s ours) Merge "Reformat timezone name to better distinguish ↵Isaac Katzenelson
GMT from timezone. DO NOT MERGE" into ics-ub-calendar-cream * commit '52b8824a974590bb0df509ce7f9c1b32178c1248': Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGE
2013-05-10am 3a1b3030: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit '3a1b303046d33639a0025e50ee11e08a5589d5b9': Import translations. DO NOT MERGE
2013-05-10am b3f4b48e: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'b3f4b48ec734146650f0755c8143aaebd487118b': Import translations. DO NOT MERGE
2013-05-10am a2dc0a70: (-s ours) Import translations. DO NOT MERGEBaligh Uddin
* commit 'a2dc0a70e5c01edf78f8a1980301be697dec94c9': Import translations. DO NOT MERGE
2013-05-09am 7ecf7983: spawn a worker thread in onReceive.Chris Wren
* commit '7ecf798315d4c54e6435f13e0eaaf5c1a0a089b2': spawn a worker thread in onReceive.
2013-05-09spawn a worker thread in onReceive.Chris Wren
Bug: 8890471 Change-Id: I4d284a29cfd83c24408b0328b603a7c938cd0d47
2013-05-09Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin