summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Move qcom off <asm/page.h>."idea133-weekly-releaseElliott Hughes2014-02-253-15/+3
|\
| * Move qcom off <asm/page.h>.Elliott Hughes2014-02-243-15/+3
|/
* Merge "qcom:msm8x26: make dependency to sync headers explicit"Rom Lemarchand2014-01-032-0/+2
|\
| * qcom:msm8x26: make dependency to sync headers explicitRom Lemarchand2014-01-032-0/+2
|/
* Merge "qcom: graphics: make dependency on sync headers explicit"Rom Lemarchand2014-01-034-0/+4
|\
| * qcom: graphics: make dependency on sync headers explicitRom Lemarchand2014-01-034-0/+4
|/
* Merge "Fix to compile with uapi headers."Christopher Ferris2013-12-147-9/+2
|\
| * Fix to compile with uapi headers.Christopher Ferris2013-12-137-9/+2
|/
* Merge commit 'b65d439fd7c9fe6d22f40180bfe4e62c59a2b970' into HEADidea133The Android Open Source Project2013-12-0519-93/+302
|\
| * am 2cacc353: Copy virtual display FB to outbuf even with no app layersJesse Hall2013-11-151-2/+2
| |\
| | * Copy virtual display FB to outbuf even with no app layersandroid-sdk-4.4.2_r1.0.1android-sdk-4.4.2_r1android-4.4w_r1android-4.4.4_r2.0.1android-4.4.4_r2android-4.4.4_r1.0.1android-4.4.4_r1android-4.4.3_r1.1.0.1android-4.4.3_r1.1android-4.4.3_r1.0.1android-4.4.3_r1android-4.4.2_r2.0.1android-4.4.2_r2android-4.4.2_r1.0.1android-4.4.2_r1android-4.4.1_r1.0.1android-4.4.1_r1kitkat-wearkitkat-mr2.2-releasekitkat-mr2.1-releasekitkat-mr2-releasekitkat-mr1.1-releasekitkat-mr1-releasekitkat-devJesse Hall2013-11-151-2/+2
| * | am 671b3ce8: merge in release branch changes (no-op).Ed Heyl2013-11-080-0/+0
| |\|
| | * merge in release branch changes (no-op).Ed Heyl2013-11-080-0/+0
| | |\
| | | * hwc: Drop alpha from writebackNaseer Ahmed2013-11-071-1/+4
| * | | am 2d3fc4ca: hwc: Drop alpha from writebackNaseer Ahmed2013-11-071-1/+4
| |\| |
| | * | hwc: Drop alpha from writebackNaseer Ahmed2013-11-071-1/+4
| | |/
| * | am 36c325db: Merge "overlay: writeback: Do not create writeback instance on d...Vineeta Srivastava2013-11-063-10/+18
| |\|
| | * Merge "overlay: writeback: Do not create writeback instance on dumpsys" into ...Vineeta Srivastava2013-11-063-10/+18
| | |\
| | | * overlay: writeback: Do not create writeback instance on dumpsysSaurabh Shah2013-11-063-10/+18
| * | | am 8f1c93c4: hwc: virtual display: Use outbuf handle width to configure xresSaurabh Shah2013-11-061-2/+3
| |\| |
| | * | hwc: virtual display: Use outbuf handle width to configure xresSaurabh Shah2013-11-061-2/+3
| | |/
| * | am 103c7369: overlay: writeback: Add dumpsys infoSaurabh Shah2013-10-295-5/+15
| |\|
| | * overlay: writeback: Add dumpsys infoSaurabh Shah2013-10-295-5/+15
| * | am 30f8aae8: hwc: Do not use fb handle in hwc_prepareSaurabh Shah2013-10-292-52/+61
| |\|
| | * hwc: Do not use fb handle in hwc_prepareSaurabh Shah2013-10-292-52/+61
| * | am 7220a4f0: hwc: Do not compose RGB layers for virtual displaysNaseer Ahmed2013-10-281-0/+16
| |\|
| | * hwc: Do not compose RGB layers for virtual displaysNaseer Ahmed2013-10-281-0/+16
| * | am b434b987: hwc: Add support for virtual displaysSaurabh Shah2013-10-287-43/+158
| |\|
| | * hwc: Add support for virtual displaysSaurabh Shah2013-10-287-43/+158
| * | am c20104e1: overlay: Trace MDP ioctlsNaseer Ahmed2013-10-251-0/+18
| |\|
| | * overlay: Trace MDP ioctlsNaseer Ahmed2013-10-251-0/+18
| * | am 5f531ba3: gralloc: Set default value for implementation defined formatsNaseer Ahmed2013-10-251-0/+6
| |\|
| | * gralloc: Set default value for implementation defined formatsNaseer Ahmed2013-10-251-0/+6
| * | am 873a69a6: display: Use L3 DRM for non TZ contentNaseer Ahmed2013-10-245-9/+19
| |\|
| | * display: Use L3 DRM for non TZ contentNaseer Ahmed2013-10-245-9/+19
| * | am d76c9788: am d1c09356: Merge "libcopybit: do not use GNU old-style field d...Nick Kralevich2013-10-201-10/+10
| |\ \ | | |/ | |/|
| * | Merge "hwc: Enable rotator during resolution change." into klp-devVineeta Srivastava2013-10-172-1/+14
| |\ \
| | * | hwc: Enable rotator during resolution change.Naseer Ahmed2013-10-172-1/+14
* | | | Disable treating warnings as errorsConley Owens2013-11-221-1/+1
* | | | Merge commit 'f27ac60c571541b7019ed24d05b0de67005807da' into HEADThe Android Open Source Project2013-11-22277-38/+42881
|\| | |
| * | | merge in klp-release (no-op)android-cts-4.4_r1kitkat-cts-devEd Heyl2013-10-160-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-150-0/+0
| |/| |
| | * | overlay: Account for transform in size calculationNaseer Ahmed2013-10-111-0/+3
| | * | hwc: Do not punt secure layers for non integral cropsNaseer Ahmed2013-10-101-1/+1
| | * | hwc: Include more cases in partial MDP composition.Saurabh Shah2013-10-093-46/+96
| | * | hwc: Add check for block mode for rotated videoSaurabh Shah2013-10-093-11/+17
| | * | gralloc: Perform function to return custom strideNaseer Ahmed2013-10-084-0/+32
| | * | merge in klp-release history after reset to klp-devThe Android Automerger2013-10-030-0/+0
| | |\ \
| | | * \ merge in klp-release history after reset to klp-devThe Android Automerger2013-10-020-0/+0
| | | |\ \
| | | | * | fix fd leak in memtrack.msm8960Colin Cross2013-09-301-1/+4