| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix snapshot crash | David 'Digit' Turner | 2011-11-08 | 6 | -43/+464 |
| * | Reconcile with ics-mr1-release | The Android Open Source Project | 2011-10-31 | 0 | -0/+0 |
| |\ | |||||
| | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-23 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-18 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-16 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-06 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-10-05 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-30 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-28 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-28 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-25 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-22 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-21 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-20 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-15 | 0 | -0/+0 |
| | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-14 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-13 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-09-08 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | | | | | | | * | merge in ics-release history after reset to master | The Android Automerger | 2011-08-30 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | |/| | |||||
| * | | | | | | | | | | | | | | | | | | | | am 4f491729: am bb0673b9: Merge from ics-mr0 | Jean-Baptiste Queru | 2011-10-26 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bb0673b9: Merge from ics-mr0 | Jean-Baptiste Queru | 2011-10-26 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge from ics-mr0 | Jean-Baptiste Queru | 2011-10-26 | 1 | -3/+8 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | Reconcile with AOSP master | Jean-Baptiste Queru | 2011-10-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | Reconcile with AOSP master | Jean-Baptiste Queru | 2011-10-25 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | Reconcile with AOSP master | Jean-Baptiste Queru | 2011-10-25 | 0 | -0/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 9f3c0c76: (-s ours) Cherry-pick d0e2872 from master: Fix snapshots. do not... | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | | | am a2f29cb6: (-s ours) Cherrypick fa0c8e from master. do not merge. | Xavier Ducrohet | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0fd262f1: (-s ours) CherryPicked from d0b482e on master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7ae4139b: (-s ours) Merge from 33f89d0 on master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ffb88b0d: (-s ours) CherryPick from 3d3fea0 in master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am bed87f42: (-s ours) Merge from c68dbbe in master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 16d2d436: (-s ours) Merge from e3b840cf on master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am fe757971: (-s ours) Merge a83cf90 from master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0ae42fc7: (-s ours) Merge 6ef999d from master. Do not merge. | Vladimir Chtchetkine | 2011-10-19 | 0 | -0/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scrap IRQs for x86 system image. | Vladimir Chtchetkine | 2011-10-24 | 1 | -0/+14 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emulator crash. | Vladimir Chtchetkine | 2011-10-21 | 1 | -5/+7 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bound loop index | Vladimir Chtchetkine | 2011-10-21 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emulator crash caused by bad 'printf' | Vladimir Chtchetkine | 2011-10-20 | 2 | -3/+3 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix http proxy to deal with chunked body encoding properly. | David 'Digit' Turner | 2011-10-17 | 1 | -35/+68 |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implemented Mac camera emulation" | Vladimir Chtchetkine | 2011-10-13 | 4 | -88/+551 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented Mac camera emulation | Vladimir Chtchetkine | 2011-10-12 | 4 | -88/+551 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix -wipe-data option | Vladimir Chtchetkine | 2011-10-13 | 1 | -1/+12 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9f3c0c76: (-s ours) Cherry-pick d0e2872 from master: Fix snapshots. do not... | Vladimir Chtchetkine | 2011-10-05 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick d0e2872 from master: Fix snapshots. do not merge. | Vladimir Chtchetkine | 2011-10-05 | 5 | -22/+27 |
| | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix snapshots | Vladimir Chtchetkine | 2011-10-05 | 5 | -22/+27 |
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
 |
index : external_qemu.git | |
| external/qemu | git repository hosting |
| aboutsummaryrefslogtreecommitdiffstats |