aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-140-0/+0
| | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-130-0/+0
| | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-080-0/+0
| | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-08-300-0/+0
| | | | | | | | | | | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | |/ | | | | | | | | | | | | | | | | | | |/|
* | | | | | | | | | | | | | | | | | | | am 4f491729: am bb0673b9: Merge from ics-mr0Jean-Baptiste Queru2011-10-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bb0673b9: Merge from ics-mr0Jean-Baptiste Queru2011-10-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from ics-mr0Jean-Baptiste Queru2011-10-261-3/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Reconcile with AOSP masterJean-Baptiste Queru2011-10-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Reconcile with AOSP masterJean-Baptiste Queru2011-10-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / / / / / | | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Reconcile with AOSP masterJean-Baptiste Queru2011-10-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9f3c0c76: (-s ours) Cherry-pick d0e2872 from master: Fix snapshots. do not...Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | am a2f29cb6: (-s ours) Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0fd262f1: (-s ours) CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7ae4139b: (-s ours) Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ffb88b0d: (-s ours) CherryPick from 3d3fea0 in master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bcc9f5fc: (-s ours) Merge from 5f8faae on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am bed87f42: (-s ours) Merge from c68dbbe in master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 16d2d436: (-s ours) Merge from e3b840cf on master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fe757971: (-s ours) Merge a83cf90 from master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0ae42fc7: (-s ours) Merge 6ef999d from master. Do not merge.Vladimir Chtchetkine2011-10-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scrap IRQs for x86 system image.Vladimir Chtchetkine2011-10-241-0/+14
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emulator crash.Vladimir Chtchetkine2011-10-211-5/+7
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bound loop indexVladimir Chtchetkine2011-10-211-1/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix emulator crash caused by bad 'printf'Vladimir Chtchetkine2011-10-202-3/+3
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix http proxy to deal with chunked body encoding properly.David 'Digit' Turner2011-10-171-35/+68
| |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Implemented Mac camera emulation"Vladimir Chtchetkine2011-10-134-88/+551
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented Mac camera emulationVladimir Chtchetkine2011-10-124-88/+551
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix -wipe-data optionVladimir Chtchetkine2011-10-131-1/+12
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am 9f3c0c76: (-s ours) Cherry-pick d0e2872 from master: Fix snapshots. do not...Vladimir Chtchetkine2011-10-050-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick d0e2872 from master: Fix snapshots. do not merge.Vladimir Chtchetkine2011-10-055-22/+27
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Fix snapshotsVladimir Chtchetkine2011-10-055-22/+27
| |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "ANDROID-KERNEL.TXT: Update document"David 'Digit' Turner2011-10-041-3/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | ANDROID-KERNEL.TXT: Update documentDavid 'Digit' Turner2011-10-041-3/+8
* | | | | | | | | | | | | | | | | | | | | | | | | | | am a2f29cb6: (-s ours) Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-040-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | Cherrypick fa0c8e from master. do not merge.Xavier Ducrohet2011-10-042-4/+12
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | New AVD property to control presence of hw main keys.Xavier Ducrohet2011-10-042-4/+12
| |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | am 0fd262f1: (-s ours) CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-09-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | CherryPicked from d0b482e on master. Do not merge.Vladimir Chtchetkine2011-09-295-4/+32
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | Fix IRQ allocation for goldfish devices.Vladimir Chtchetkine2011-09-295-4/+32
| |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | am 7ae4139b: (-s ours) Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-280-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge from 33f89d0 on master. Do not merge.Vladimir Chtchetkine2011-09-282-1/+12
| | |_|_|_|_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | Fix CPU architecture reported in HW configVladimir Chtchetkine2011-09-282-1/+12
| |_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am 4990431d: (-s ours) Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Merge from 491e6d on master. Do not merge.Vladimir Chtchetkine2011-09-271-3/+3
| | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 40c8d18f: (-s ours) Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-09-270-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | Merge from c3b969ab on master. Do not merge.Vladimir Chtchetkine2011-09-271-2/+17
| | |_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Use different macro for KVMVladimir Chtchetkine2011-09-271-3/+3