aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Implements white balance and exposure compensation for emulated webcam"Vladimir Chtchetkine2011-12-137-80/+274
|\
| * Implements white balance and exposure compensation for emulated webcamVladimir Chtchetkine2011-12-057-80/+274
* | Implements double-linked circular list.Vladimir Chtchetkine2011-12-081-0/+112
* | Fixes emulator crash due to premature pipe client destruction.Vladimir Chtchetkine2011-12-071-9/+26
|/
* Fix 64-bit build.David 'Digit' Turner2011-11-231-5/+7
* Add 320x240 frame support for Windows and Mac camera emulationVladimir Chtchetkine2011-11-152-0/+4
* Add required frame dimensions for Win and Mac.Vladimir Chtchetkine2011-11-152-12/+22
* Minor fix for debug outputVladimir Chtchetkine2011-11-151-1/+1
* Fixes windows buildVladimir Chtchetkine2011-11-101-2/+2
* Implements sensors emulation using a connected Android deviceVladimir Chtchetkine2011-11-0910-13/+2048
* Merge "Fix snapshot crash"Vladimir Chtchetkine2011-11-096-43/+464
|\
| * Fix snapshot crashDavid 'Digit' Turner2011-11-086-43/+464
* | Fixed build-kernel.sh to set ZIMAGE when --cross is specifiedAndrew Hsieh2011-11-031-2/+8
|/
* Reconcile with ics-mr1-releaseThe Android Open Source Project2011-10-310-0/+0
|\
| * merge in ics-release history after reset to masterThe Android Automerger2011-10-230-0/+0
| |\
| | * merge in ics-release history after reset to masterThe Android Automerger2011-10-180-0/+0
| | |\
| | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-160-0/+0
| | | |\
| | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-060-0/+0
| | | | |\
| | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-10-050-0/+0
| | | | | |\
| | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-300-0/+0
| | | | | | |\
| | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | |\
| | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-280-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-250-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-220-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-210-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-200-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-180-0/+0
| | | | | | | | | | | | | |\
| | | | | | | | | | | | | | * merge in ics-release history after reset to masterThe Android Automerger2011-09-150-0/+0
| | | | | | | | | | | | | | |\
| | | | | | | | | | | | | | | * 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \