summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-04-13Ensure policy notifications are shownandroid-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releasejb-mr2-devPaul Westbrook
cherry-pick of: https://googleplex-android-review.googlesource.com/218352 https://googleplex-android-review.googlesource.com/218353 Bug: 8510828 Change-Id: Ic788c40456e32fec5e7589c4ed2f40e399dd062d
2013-03-11am d61fe17f: am e0faab0f: am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: ↵Jean-Baptiste Queru
(-s ours) Reconcile with jb-mr1-release - do not merge * commit 'd61fe17fe45fb261534078d2fa8f2443ce5543f7':
2013-03-11am e0faab0f: am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: (-s ours) ↵Jean-Baptiste Queru
Reconcile with jb-mr1-release - do not merge * commit 'e0faab0f34c92c098b8725fd3cbfdd0a92b09fd3':
2013-03-11am 14367f5b: am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with ↵Jean-Baptiste Queru
jb-mr1-release - do not merge * commit '14367f5b4041d5a29fdb349e8058ac5ef11d805d':
2013-03-11am 438fa99e: (-s ours) am 68a406b3: (-s ours) Reconcile with jb-mr1-release ↵jb-mr1.1-devJean-Baptiste Queru
- do not merge * commit '438fa99e5c16a6a3f77cfc73771ff20421bbe9f2':
2013-03-11am 68a406b3: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
* commit '68a406b3c7caefe439924380694939d828d0d538':
2013-03-11Reconcile with jb-mr1-release - do not mergejb-mr1-devJean-Baptiste Queru
2012-12-04Comment out the unused moduleYing Wang
To fix build warning: find: `src': No such file or directory Change-Id: Iafc99b3b84395ea47fa9615439097b86c9967619
2012-11-26am 458944fd: am b2e8a1b2: am 2fd0058c: Only clear sync error map on successPaul Westbrook
* commit '458944fd75bfe5b717102f34205f739f1dcf50e3': Only clear sync error map on success
2012-11-26am b2e8a1b2: am 2fd0058c: Only clear sync error map on successPaul Westbrook
* commit 'b2e8a1b23c1e7cd0d12b7429adad023e25438a27': Only clear sync error map on success
2012-11-26am 2fd0058c: Only clear sync error map on successPaul Westbrook
* commit '2fd0058c0204b60966a77265e75bfbc471416aa8': Only clear sync error map on success
2012-11-21Only clear sync error map on successandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-releasePaul Westbrook
We don't want to clear the error map unless there was a successful sync. Otherwise, the device will attempt a sync evert 15 seconds This is the first part of the fix for bug 7567773 Change-Id: Icd0e70d87a7f588e242f0f100ee0b36b3aa85d89
2012-11-06am 69747880: (-s ours) am a12b114c: am fcc33af6: Reconcile with ↵The Android Open Source Project
jb-mr1-factory-release jb-mr1-release - do not merge * commit '69747880790a89feb80fe231a814f21b1bc0485e':
2012-11-06am a12b114c: am fcc33af6: Reconcile with jb-mr1-factory-release ↵jb-mr1-dev-plus-aospThe Android Open Source Project
jb-mr1-release - do not merge * commit 'a12b114c705f8e1c70b83aa354bae00b6ac09f63':
2012-11-06am fcc33af6: Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project
* commit 'fcc33af67985b14916f6ff5f291248468dca1377': Export provider Fix directory provider authority name & export provider Make sure we send attachments when not smart-forward Fix problem w/ all-day event in invitation
2012-11-06Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: I95ca40513c2acdba4378d776a7158a65ee724adf
2012-10-31am bd815ec0: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
* commit 'bd815ec0000ac77ec2a1d1c026d62f194c4ed6ea':
2012-10-31Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: Idbfc92bb061e8331db8daa2a8a61efc6d7a1cee6
2012-10-22merge in jb-mr1-release history after reset to jb-mr1-devandroid-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1-releaseThe Android Automerger
2012-10-22am 96878285: am 8222362d: am f57bb027: Simple fix for 7381557Paul Westbrook
* commit '968782851b76a1f3734978cb18504c524f46723b': Simple fix for 7381557
2012-10-22am 8222362d: am f57bb027: Simple fix for 7381557Paul Westbrook
* commit '8222362db6cfd7bfc475805fba1add4444e1c217': Simple fix for 7381557
2012-10-22am f57bb027: Simple fix for 7381557Paul Westbrook
* commit 'f57bb0274cd334a57e643027c4e1d203f6e7e181': Simple fix for 7381557
2012-10-22Simple fix for 7381557android-sdk-support_r11Paul Westbrook
A better fix will be made in Exchange2 in UR8 Bug: 7381557 Change-Id: I7d56c08e93b5bfdcef7c5d3a37136cc3e67f0ce9
2012-10-15am d832219f: (-s ours) Reconcile with jb-mr1-factory-release - do not mergeThe Android Open Source Project
* commit 'd832219fbc7ba878700b1ec289e159563a20e7e1':
2012-10-15Reconcile with jb-mr1-factory-release - do not mergeThe Android Open Source Project
Change-Id: Ib9988ab46fa193d7b67d07fbaf5ac4d58a0408f8
2012-10-12merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger
2012-10-12am 990287db: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
* commit '990287dbdc2ba8b85811d6fe20c44c6283aee04b':
2012-10-12Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: I8b11105764f62150a9aff92595c672e7fc448b7d
2012-10-11am 84b145b9: am db49a8ca: am 2a1209a5: Fix saving contact from Exchange GAL ↵Paul Westbrook
contact * commit '84b145b97b0ce934cdf6d16874eb6192cb0c7d25': Fix saving contact from Exchange GAL contact
2012-10-11am db49a8ca: am 2a1209a5: Fix saving contact from Exchange GAL contactPaul Westbrook
* commit 'db49a8cae65cebfe369f7a2a561a700b682048b2': Fix saving contact from Exchange GAL contact
2012-10-11merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-11am 2a1209a5: Fix saving contact from Exchange GAL contactPaul Westbrook
* commit '2a1209a5a72e03643d46eff134920ac5a5fbc17d': Fix saving contact from Exchange GAL contact
2012-10-11Fix saving contact from Exchange GAL contactPaul Westbrook
Make sure to call the method parameters in the right order Bug: 6917029 Change-Id: I3c1d96021f0001b69ba4d78bc2dffc8084c0c962
2012-10-10am 4da63795: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release ↵The Android Open Source Project
- do not merge * commit '4da6379559bbe40e7ed28ab454de6ac256ee9a3d':
2012-10-10Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: Ie7f09921561f5f1d52aba6d205cb4ae95be13f70
2012-10-10merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger
2012-10-10merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-09am 9f8346e7: am 427107a6: am 4acfe7ed: Fix stack overflow exceptionPaul Westbrook
* commit '9f8346e7a0110864177f1925d7fffc1619767677': Fix stack overflow exception
2012-10-09am 427107a6: am 4acfe7ed: Fix stack overflow exceptionPaul Westbrook
* commit '427107a668f83946ecc6232795e2cea280637af9': Fix stack overflow exception
2012-10-09am 4acfe7ed: Fix stack overflow exceptionPaul Westbrook
* commit '4acfe7ed048f265ce12842476edf07d28f595b87': Fix stack overflow exception
2012-10-09Fix stack overflow exceptionPaul Westbrook
Bug: 7304064 Change-Id: I795878ee11d681d7020ba9a9b25e06ba807c0107
2012-10-09am 3df828a2: (-s ours) Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
* commit '3df828a27a91f22b1329953b473da61d324fd84b':
2012-10-09Reconcile with jb-mr1-release - do not mergeThe Android Open Source Project
Change-Id: I9b5f2ad3d27d07d8864797a66ac80e9b375d03f8
2012-10-07merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger
2012-10-05am 2aa34d47: am 0b0eb370: am a5afc70e: Try to fix LGE crash bugMarc Blank
* commit '2aa34d47b9c183d2da7c3f9555695bf22397cfd3': Try to fix LGE crash bug
2012-10-05am 0b0eb370: am a5afc70e: Try to fix LGE crash bugMarc Blank
* commit '0b0eb3703657999a34f8c15cab2a8598f5e0242c': Try to fix LGE crash bug
2012-10-05am a5afc70e: Try to fix LGE crash bugMarc Blank
* commit 'a5afc70e49ada08e7572be51fc48323ef1c6f6a8': Try to fix LGE crash bug
2012-10-05Try to fix LGE crash bugMarc Blank
Bug: 7254204 Change-Id: Ib24e48ff10a452a086cdb3412a22c68acda3dbd0
2012-09-28am d872c951: Merge from jb-mr1-aah-devJean-Baptiste Queru
* commit 'd872c951778f00c352cd40c55c8636ee4c1eccf6': Import translations. DO NOT MERGE Import translations. DO NOT MERGE Import translations. DO NOT MERGE
2012-09-28Merge from jb-mr1-aah-devJean-Baptiste Queru
Change-Id: If78b5aa1133c09087dc9dbd58324d3fa6242a7ef
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 20:35:49 +0000