summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 282ab1b6: Merge "gralloc: dont hardcode 32bpp as RGBX"Jesse Hall2014-03-111-1/+1
|\
| * Merge "gralloc: dont hardcode 32bpp as RGBX"Jesse Hall2014-03-061-1/+1
| |\
| | * gralloc: dont hardcode 32bpp as RGBXBernhard Rosenkraenzer2014-02-211-1/+1
* | | am b342abb6: Merge "gralloc: make private_handle_t layout consistent on 32/64...Greg Hackmann2014-03-111-1/+1
|\ \ \ | |/ /
| * | Merge "gralloc: make private_handle_t layout consistent on 32/64-bit"Greg Hackmann2014-03-061-1/+1
| |\ \
| | * | gralloc: make private_handle_t layout consistent on 32/64-bitGreg Hackmann2014-03-031-1/+1
| |/ /
* | | am b96f1083: Merge "Move libhardware of <asm/page.h>."Elliott Hughes2014-03-111-5/+1
|\ \ \ | |/ /
| * | Merge "Move libhardware of <asm/page.h>."Elliott Hughes2014-02-251-5/+1
| |\ \ | | |/ | |/|
| | * Move libhardware of <asm/page.h>.Elliott Hughes2014-02-241-5/+1
| |/
* | am 56910cf5: Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to sup...Wei Wang2014-03-081-1/+3
|\ \
| * \ Merge "DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service ...Wei Wang2014-03-081-1/+3
| |\ \
| | * | DO NOT MERGE BLE peripheral mode (1/4): change HAL to support service data an...Wei Wang2014-03-071-1/+3
* | | | am 80d4eced: Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"Colin Cross2014-03-071-0/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Use /(vendor|system)/lib64/hw for 64-bit HAL libraries"Colin Cross2014-02-161-0/+5
| |\ \ \
| | * | | Use /(vendor|system)/lib64/hw for 64-bit HAL librariesDan Willemsen2014-02-161-0/+5
| |/ / /
* | | | am f77bd7d0: Merge "Try using goldfish_pipe as the device name"David Turner2014-03-071-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "Try using goldfish_pipe as the device name"David Turner2014-02-141-0/+2
| |\ \ \
| | * | | Try using goldfish_pipe as the device nameOctavian Purdila2014-01-291-0/+2
* | | | | am f4c46752: Merge "AArch64: Calculate private_handle_t\'s numInts"Greg Hackmann2014-03-071-3/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "AArch64: Calculate private_handle_t's numInts"Greg Hackmann2014-02-131-3/+5
| |\ \ \ \
| | * | | | AArch64: Calculate private_handle_t's numIntsAshok Bhat2014-02-071-3/+5
| |/ / / /
* | | | | am 1482406b: usbaudio: fix for out->dev->lock remains locked in error caseAmit Shekhar2014-03-071-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | usbaudio: fix for out->dev->lock remains locked in error caseAmit Shekhar2014-03-061-1/+1
| | |_|/ | |/| |
* | | | am 037335eb: Merge "gralloc: fix warnings"Colin Cross2014-03-074-11/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "gralloc: fix warnings"Colin Cross2014-02-064-11/+11
| |\ \ \ | | |_|/ | |/| |
| | * | gralloc: fix warningsColin Cross2014-02-054-11/+11
| |/ /
* | | am aea8c156: Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_...Colin Cross2014-01-2812-13/+13
|\ \ \ | |/ /
| * | Merge "hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATI...Colin Cross2014-01-2812-13/+13
| |\ \
| | * | hardware/libhardware: convert LOCAL_MODULE_PATH to LOCAL_MODULE_RELATIVE_PATHColin Cross2014-01-2412-13/+13
| |/ /
* | | am fa3d243b: Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware ...David Turner2014-01-234-1/+234
|\ \ \ | |/ /
| * | Merge "Vibra: Adapt AOSP (default) vibrator HAL into a hardware module."David Turner2014-01-234-1/+234
| |\ \
| | * | Vibra: Adapt AOSP (default) vibrator HAL into a hardware module.Vincent Becker2014-01-134-1/+234
* | | | am a97c6fec: Merge "hardware: fix check for ro.hardware.<class> property"Colin Cross2014-01-131-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "hardware: fix check for ro.hardware.<class> property"Colin Cross2014-01-141-1/+1
| |\ \ \
| | * | | hardware: fix check for ro.hardware.<class> propertyColin Cross2014-01-131-1/+1
| |/ / /
* | | | am e0c252ae: Merge "hardware: add ro.hardware.<class> to HAL loading properit...Colin Cross2014-01-021-28/+44
|\ \ \ \ | |/ / /
| * | | Merge "hardware: add ro.hardware.<class> to HAL loading properites list"Colin Cross2014-01-021-28/+44
| |\ \ \ | | |/ / | |/| |
| | * | hardware: add ro.hardware.<class> to HAL loading properites listColin Cross2014-01-021-28/+44
| |/ /
* | | am 20ebefd9: Merge commit \'eed5dceb4a0bc02f50f236ab191d30c49c58f610\' into HEADThe Android Open Source Project2013-12-050-0/+0
|\ \ \ | |/ /
| * | Merge commit 'eed5dceb4a0bc02f50f236ab191d30c49c58f610' into HEADThe Android Open Source Project2013-12-052-13/+38
| |\ \
* | \ \ am 047510b1: Merge "gralloc: delete unused mutex declaration"Rom Lemarchand2013-11-261-4/+0
|\ \ \ \ | |/ / /
| * | | Merge "gralloc: delete unused mutex declaration"Rom Lemarchand2013-11-261-4/+0
| |\ \ \
| | * | | gralloc: delete unused mutex declarationRom Lemarchand2013-11-261-4/+0
| |/ / /
* | | | am bae5cf92: Merge commit \'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0\' into HEADThe Android Open Source Project2013-11-220-0/+0
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Merge commit 'c9940a2bfe94dbe2ef3bfe5e8692bf4e3cea5ba0' into HEADThe Android Open Source Project2013-11-2248-182/+5273
| |\ \
* | \ \ am 7ccf148f: Update HWC documentation for virtual displaysJesse Hall2013-11-131-9/+23
|\ \ \ \ | | |_|/ | |/| |
| * | | Update HWC documentation for virtual displaysJesse Hall2013-11-131-9/+23
* | | | am af822c43: Merge "gralloc: do not use GNU old-style field designators"Nick Kralevich2013-11-061-20/+20
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "gralloc: do not use GNU old-style field designators"Nick Kralevich2013-11-071-20/+20
| |\ \ \
| | * | | gralloc: do not use GNU old-style field designatorssynergy dev2013-11-061-20/+20
| |/ / /