summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "CameraHal: Avoids possible race conditions while accessing 'mParams'" ...Daniel Levin2012-07-255-6/+40
|\
| * CameraHal: Avoids possible race conditions while accessing 'mParams'Emilian Peev2012-05-237-91/+84
| * Don't include widevine proprietary for panda.Jean-Baptiste Queru2012-05-221-0/+2
| * hwc: Fix truncation errors in scaling decisionLajos Molnar2012-05-211-4/+8
| * Fix secondary builds (AOSP, panda) - do not mergeJean-Baptiste Queru2012-05-211-2/+4
* | Merge "CameraHAL: Aligns UV planes during YV12 preview callbacks" into jb-mig...Daniel Levin2012-07-250-0/+0
|\ \ | |/
| * CameraHAL: Aligns UV planes during YV12 preview callbacksEmilian Peev2012-05-101-4/+28
* | Merge "CameraHal: Remove lock queries from 'mParams' during 'getParameters()'...Daniel Levin2012-07-250-0/+0
|\ \ | |/
| * CameraHal: Remove lock queries from 'mParams' during 'getParameters()'Emilian Peev2012-05-081-10/+16
* | Merge "CameraHal: Add support for YUY2 preview callbacks" into jb-migrationDaniel Levin2012-07-250-0/+0
|\ \ | |/
| * CameraHal: Add support for YUY2 preview callbacksEmilian Peev2012-05-072-7/+46
* | Merge "CameraHal: Do full AF sweep during lost AF status" into jb-migrationDaniel Levin2012-07-252-0/+27
|\ \ | |/
| * CameraHal: Do full AF sweep during lost AF statusEmilian Peev2012-05-042-8/+10
| * Part of fix for build break - missing WVCryptoPlugin.h in full_tuna buildJeff Tinker2012-05-012-10/+0
| * Merge "Build libdrmdecrypt by linking against new wv static library." into jb...Jeff Tinker2012-05-013-0/+37
| |\
| | * Build libdrmdecrypt by linking against new wv static library.Andreas Huber2012-04-273-0/+37
| * | Merge "Renaming AAC variants to their more technical forms." into jb-devDave Burke2012-04-301-3/+1
| |\ \
* | \ \ Merge "Renaming AAC variants to their more technical forms." into jb-migrationDaniel Levin2012-07-251-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Renaming AAC variants to their more technical forms.Dave Burke2012-04-301-3/+1
| | |/ | |/|
* | | Merge "CameraHal: Fix for YV12 camera callbacks" into jb-migrationDaniel Levin2012-07-251-0/+4
|\ \ \ | | |/ | |/|
| * | CameraHal: Fix for YV12 camera callbacksEmilian Peev2012-04-291-3/+7
| |/
| * am eafa266c: (-s ours) DO NOT MERGETravis Geiselbrecht2012-04-200-0/+0
| |\
| | * DO NOT MERGETravis Geiselbrecht2012-04-201-1/+5
| * | Merge "WORKAROUND for Bug:5965421"Mathias Agopian2012-04-191-0/+4
| |\ \
| | * | WORKAROUND for Bug:5965421Mathias Agopian2012-04-181-0/+4
* | | | Merge "Revert "Use new camera connect api."" into jb-migrationDaniel Levin2012-07-2516-25/+5214
|\ \ \ \ | |/ / /
| * | | Revert "Use new camera connect api."Wu-cheng Li2012-04-192-6/+6
| |/ /
| * | am c6336459: (-s ours) DO NOT MERGETravis Geiselbrecht2012-04-130-0/+0
| |\ \ | | |/
| | * DO NOT MERGETravis Geiselbrecht2012-04-121-2/+32
| * | Merge "hwc: add handling for new style vsync events"Erik Gilling2012-04-121-1/+4
| |\ \
| | * | hwc: add handling for new style vsync eventsErik Gilling2012-04-111-1/+4
| * | | am e22bec1a: (-s ours) DO NOT MERGETravis Geiselbrecht2012-04-120-0/+0
| |\ \ \ | | |/ / | |/| / | | |/
| | * DO NOT MERGETravis Geiselbrecht2012-04-121-1/+1
* | | Merge "CameraHAL: Fix for CTS test #testFocusDistances" into jb-migrationDaniel Levin2012-07-250-0/+0
|\ \ \ | |/ /
| * | CameraHAL: Fix for CTS test #testFocusDistancesEmilian Peev2012-04-111-0/+2
| * | add API 0.3 support to HWC HAL.Mathias Agopian2012-04-051-22/+91
| * | add omapfb.h header fileErik Gilling2012-04-033-0/+506
| * | Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
| |\ \ | | |/
| | * DO NOT MERGETravis Geiselbrecht2012-03-221-1/+31
| * | Merge commit '04512dd'Mike Lockwood2012-04-031-1/+1
| |\ \ | | |/
| | * hwc: pull down 32 modes instead of 16, some panels have a lotTravis Geiselbrecht2012-03-211-1/+1
| * | Merge commit '04512dd^'Mike Lockwood2012-04-030-0/+0
| |\ \ | | |/
| | * DO NOT MERGEDandawate Saket2012-03-211-20/+166
| | * DO NOT MERGEBryan Buckley2012-03-142-2/+3
| | * DO NOT MERGETrusted Logic2012-03-142-721/+0
| | * DO NOT MERGEBryan Buckley2012-03-143-3/+3
| | * DO NOT MERGETrusted Logic2012-03-144-19/+26
| | * DO NOT MERGETrusted Logic2012-03-148-1/+2194
| | * DO NOT MERGETrusted Logic2012-03-147-26/+422
| | * DO NOT MERGETrusted Logic2012-03-141-5/+5