summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-260-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-200-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-160-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-140-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-130-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-110-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-100-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-060-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-050-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2011-01-040-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | |/ / / / /
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | Merge remote branch 'goog/gingerbread' into gingerbread-releaseandroid-merger2010-12-233-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2010-12-220-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ merge in gingerbread-release history after reset to gingerbreadThe Android Automerger2010-12-210-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | New kernel from crespo-emr branch:Sriram Raman2010-12-172-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7f1638 samsung_modemctl: downref mmio sem request count on failure Change-Id: I649c83c03d342782ef49c74dd455e47061e3bdcd
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | New kernel prebuilt from crespo-emr branch:Ed Heyl2010-12-162-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a74912ac ARM: herring: touchkey power on delay Change-Id: I8f9db02d5737e041b6f69716af360155df12a985
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Make bluetooth the owner of /efs/bluetoothJaikumar Ganesh2010-12-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /efs permissions were changed. This was breaking Bluetooth. Bug: 3287732 Change-Id: Ib646d87a540b2307336077f5dfe2f3a1abee4d3c
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | fixup efs subdir permissionsBrian Swetland2010-12-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently the factory process gets these wrong... Change-Id: I3c8f2b8372862437e0266fe8d3de3e2badcae8c3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | manual merge 0244ecfandroid-merger2010-12-072-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45949323053583fc1c12460061f31eea067e7fa5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | 5PC11X: libcamera: move lens to default position when preview startskyoungho.yun2010-12-072-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After taking a picture, the focus is maintained. So if user change from camera mode to video mode after taking a picture very closely to object, focus in video mode is not normal. So move lens to default position when preview starts. Change-Id: I3e41acbb22ad8a754755feae304c287dce690425 Signed-off-by: kyoungho.yun <kyoungho.yun@samsung.com>
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Update kernelSimon Wilson2010-11-242-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 119403d ARM: herring: watchdog: Increase timeout and use realtime workqueue Change-Id: If2644c723b831800c58ad6c0e5e31bd003ff6b1c
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * | | | | Merge remote branch 'goog/gingerbread' into gingerbread-releaseandroid-build SharedAccount2010-11-222-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ merge from gingerbreadandroid-build SharedAccount2010-11-182-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib5cc4fe20ac4a6283d9c79d842aa0a89acf88a32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-184-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-165-22/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-165-22/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-154-43/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-153-33/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-124-21/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-1114-236/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-1012-72/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-0523-5/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-0410-16/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-0310-41/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-11-017-12/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-295-44/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-289-134/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-2810-73/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-266-55/+279
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-269-70/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-257-419/+373
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-256-266/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-2412-84/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-228-31/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-2216-127/+1836
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-216-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-202-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gingerbread' into gingerbread-releaseThe Android Automerger2010-10-208-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \