summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 867dc18e: am 9405746d: Merge "Rename --include-cfi to --generate-debug-info."David Srbecky2015-05-281-4/+4
|\
| * am 9405746d: Merge "Rename --include-cfi to --generate-debug-info."David Srbecky2015-05-281-4/+4
| |\
| | * Merge "Rename --include-cfi to --generate-debug-info."David Srbecky2015-05-281-4/+4
| | |\
| | | * Rename --include-cfi to --generate-debug-info.David Srbecky2015-05-281-4/+4
| | |/
* | | am f008799d: SF: Skip render-to-texture for color transformsDan Stoza2015-05-288-94/+18
|\ \ \
| * | | SF: Skip render-to-texture for color transformsDan Stoza2015-05-278-94/+18
* | | | am e35e6080: am 738fc3a7: Merge "framework/native/docs: remove doc footer for...Johan Euphrosine2015-05-273-4/+3
|\ \ \ \ | | |/ / | |/| |
| * | | am 738fc3a7: Merge "framework/native/docs: remove doc footer for jd output"Johan Euphrosine2015-05-273-4/+3
| |\ \ \ | | | |/ | | |/|
| | * | Merge "framework/native/docs: remove doc footer for jd output"Johan Euphrosine2015-05-273-4/+3
| | |\ \
| | | * | framework/native/docs: remove doc footer for jd outputJohan Euphrosine2015-05-273-4/+3
| | |/ /
* | | | am 7fc3ef0e: Merge "Add hotplug support for primary display." into mnc-devMichael Lentine2015-05-271-2/+5
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge "Add hotplug support for primary display." into mnc-devMichael Lentine2015-05-271-2/+5
| |\ \ \
| | * | | Add hotplug support for primary display.Michael Lentine2015-05-221-2/+5
* | | | | am 0e65e6c2: libgui: Fix surface damage on rotated buffersDan Stoza2015-05-271-2/+6
|\ \ \ \ \ | |/ / / /
| * | | | libgui: Fix surface damage on rotated buffersDan Stoza2015-05-261-2/+6
* | | | | am f9c83b8f: am 116e7aeb: Merge "frameworks/native/docs: add doxygen configur...Johan Euphrosine2015-05-223-0/+1919
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 116e7aeb: Merge "frameworks/native/docs: add doxygen configuration"Johan Euphrosine2015-05-223-0/+1919
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "frameworks/native/docs: add doxygen configuration"Johan Euphrosine2015-05-223-0/+1919
| | |\ \ \
| | | * | | frameworks/native/docs: add doxygen configurationJohan Euphrosine2015-05-213-0/+1919
| | |/ / /
* | | | | am 20828e63: Merge "Fix surfaceflinger tests." into mnc-devMichael Lentine2015-05-222-23/+29
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge "Fix surfaceflinger tests." into mnc-devMichael Lentine2015-05-222-23/+29
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Fix surfaceflinger tests.Michael Lentine2015-05-222-23/+29
* | | | | am 01f9e920: Merge "Fix libgui tests." into mnc-devMichael Lentine2015-05-222-8/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix libgui tests." into mnc-devMichael Lentine2015-05-222-8/+13
| |\ \ \ \ | | |/ / /
| | * | | Fix libgui tests.Michael Lentine2015-05-222-8/+13
* | | | | am 041b945e: Merge "fix BufferItem flatten/unflatten alignment" into mnc-devChong Zhang2015-05-222-15/+26
|\ \ \ \ \ | |/ / / /
| * | | | Merge "fix BufferItem flatten/unflatten alignment" into mnc-devChong Zhang2015-05-222-15/+26
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | fix BufferItem flatten/unflatten alignmentChong Zhang2015-05-222-15/+26
* | | | | Merge commit '217a04ba' into manualmergeAdam Lesinski2015-05-181-0/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Adding round qualifier constant to native API." into mnc-devAdam Powell2015-05-181-0/+15
| |\ \ \ \
| | * | | | Adding round qualifier constant to native API.Adam Lesinski2015-05-151-0/+15
* | | | | | am 699a32bc: Merge "Refactor ConsumerBase and it\'s derived classes." into mn...Michael Lentine2015-05-186-67/+25
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Refactor ConsumerBase and it's derived classes." into mnc-devMichael Lentine2015-05-186-67/+25
| |\ \ \ \ \
| | * | | | | Refactor ConsumerBase and it's derived classes.Michael Lentine2015-05-186-67/+25
* | | | | | | am bfb1f1cc: Don\'t use TEMP_FAILURE_RETRY on close in frameworks/native.Elliott Hughes2015-05-160-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Don't use TEMP_FAILURE_RETRY on close in frameworks/native.Elliott Hughes2015-05-152-2/+2
| | |/ / / / | |/| | | |
* | | | | | am b8e6cb08: am e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in fr...Elliott Hughes2015-05-162-2/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | am e814b43c: Merge "Don\'t use TEMP_FAILURE_RETRY on close in frameworks/nati...Elliott Hughes2015-05-162-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Merge "Don't use TEMP_FAILURE_RETRY on close in frameworks/native."Elliott Hughes2015-05-162-2/+2
| | |\ \ \ \
| | | * | | | Don't use TEMP_FAILURE_RETRY on close in frameworks/native.Elliott Hughes2015-05-152-2/+2
* | | | | | | am 2c237ee1: Fix async_stopJohn Reck2015-05-151-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Fix async_stopJohn Reck2015-05-151-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | am 3db36803: Merge "Add ConsumerBase::isAbandoned" into mnc-devJohn Reck2015-05-142-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add ConsumerBase::isAbandoned" into mnc-devJohn Reck2015-05-142-0/+8
| |\ \ \ \ \
| | * | | | | Add ConsumerBase::isAbandonedJohn Reck2015-05-142-0/+8
* | | | | | | am 47948791: Merge "SurfaceFlinger: Handle EGL errors more cleanly" into mnc-devDan Stoza2015-05-140-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "SurfaceFlinger: Handle EGL errors more cleanly" into mnc-devDan Stoza2015-05-142-1/+21
| |\ \ \ \ \ \
| | * | | | | | SurfaceFlinger: Handle EGL errors more cleanlyDan Stoza2015-05-142-1/+21
* | | | | | | | am 51c8c502: Merge "Modify EGL to disconnect the window when the surface gets...Michael Lentine2015-05-142-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Modify EGL to disconnect the window when the surface gets destroyed." ...Michael Lentine2015-05-142-2/+11
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |