summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE."Wu-cheng Li2011-08-171-6/+17
|\ \ \
| * | | Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE.Wu-cheng Li2011-08-181-6/+17
* | | | Merge "don't return the current buffer from dequeueBuffer"Mathias Agopian2011-08-171-1/+1
|\ \ \ \
| * | | | don't return the current buffer from dequeueBufferMathias Agopian2011-08-171-1/+1
| | |/ / | |/| |
* | | | am ddf155b8: am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 opera...Xavier Ducrohet2011-08-171-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | am 5dcda1fd: am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actua...Xavier Ducrohet2011-08-171-1/+1
| |\ \ \
| | * \ \ am 88512f59: am a8313e71: Merge "Fix String16 operator+ to actually work"Xavier Ducrohet2011-08-171-1/+1
| | |\ \ \
| | | * \ \ am a8313e71: Merge "Fix String16 operator+ to actually work"Xavier Ducrohet2011-08-171-1/+1
| | | |\ \ \
| | | | * | | Fix String16 operator+ to actually workJosiah Gaskin2011-08-161-1/+1
| | * | | | | am b654e6e5: am d144748d: Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am d144748d: Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Add missing includeJean-Baptiste Queru2011-08-111-0/+2
| | * | | | | am 44874c23: am c962512c: Merge "added stub for getting buffer from surface t...Jean-Baptiste Queru2011-08-111-0/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am c962512c: Merge "added stub for getting buffer from surface texture"Jean-Baptiste Queru2011-08-111-0/+1
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | added stub for getting buffer from surface textureChris Craik2011-08-111-0/+1
| | * | | | | am ca97671e: am 6f5a837c: Merge "Fix getSwitchState according to device capab...Jeff Brown2011-08-101-0/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | am 6f5a837c: Merge "Fix getSwitchState according to device capabilities."Jeff Brown2011-08-101-0/+1
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge "Fix getSwitchState according to device capabilities."Jeff Brown2011-08-101-0/+1
| | | | |\ \ \
| | | | | * | | Fix getSwitchState according to device capabilities.Michaƫl Burtin2011-07-291-0/+1
| | * | | | | | am 7e79b9aa: am dbff9107: Merge "Support wrapping app processes to inject deb...Jeff Brown2011-08-101-2/+8
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am dbff9107: Merge "Support wrapping app processes to inject debug instrument...Jeff Brown2011-08-101-2/+8
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4...Jeff Brown2011-08-101-2/+8
| | | | |\ \ \ \
| | | | | * | | | Support wrapping app processes to inject debug instrumentation.Jeff Brown2011-07-281-2/+8
| | | | | |/ / /
| | * | | | | | am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when trying to use set...Jean-Baptiste Queru2011-08-021-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 9b0c6bee: Merge "Fix a compiling error when trying to use setBufferCount"Jean-Baptiste Queru2011-08-021-0/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Fix a compiling error when trying to use setBufferCountTeng-Hui Zhu2011-08-021-0/+1
| * | | | | | | resolved conflicts for merge of b7f09f28 to honeycomb-plus-aospDerek Sollenberger2011-07-291-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am b7ed8471: am 01caec8c: Merge "Adding an optional param to the SurfaceTextu...Derek Sollenberger2011-07-291-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | am 01caec8c: Merge "Adding an optional param to the SurfaceTexture constructor."Derek Sollenberger2011-07-291-1/+1
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Adding an optional param to the SurfaceTexture constructor.Derek Sollenberger2011-07-291-1/+1
| | | | |/ / /
| | | | * | | DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-07-271-0/+1
| | | |/ / /
| | * | | | am 54146a63: Merge "DO NOT MERGE. may fix build on some version of gcc" into ...Xavier Ducrohet2011-06-281-0/+1
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-06-161-0/+1
| | * | | | am f458d5fd: Merge "Tweak for forward-compatibility"Jean-Baptiste Queru2011-06-241-0/+1
| | |\ \ \ \
| | | * | | | Tweak for forward-compatibilityJean-Baptiste Queru2011-06-241-0/+1
| | * | | | | am e3b05d09: Merge "Tweaks for forward-compatibility"Jean-Baptiste Queru2011-06-203-0/+4
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Tweaks for forward-compatibilityJean-Baptiste Queru2011-06-183-0/+4
| | * | | | | am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread ...Mathias Agopian2011-06-151-7/+13
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)Mathias Agopian2011-06-131-7/+13
| * | | | | | am 48294b0d: am e7d3ee9d: Revert "merge various SF fixes from gingerbread to ...Mathias Agopian2011-06-161-1/+1
| |\ \ \ \ \ \
| | * | | | | | Revert "merge various SF fixes from gingerbread to honeycomb-mr2" (DO NOT MERGE)Mathias Agopian2011-06-161-1/+1
| * | | | | | | am 0887b8c2: am 8e18668d: revert surfaceflinger leak fix as it uncovered a cr...Mathias Agopian2011-06-151-14/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | revert surfaceflinger leak fix as it uncovered a crasher on xoom (DO NOT MERGE)Mathias Agopian2011-06-151-14/+0
| * | | | | | | am d5244e0a: am 52a43990: Revert "revert surfaceflinger leak fix as it uncove...Mathias Agopian2011-06-151-0/+14
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Revert "revert surfaceflinger leak fix as it uncovered a crasher on xoom"Mathias Agopian2011-06-151-0/+14
| * | | | | | | am 7ecdeb6e: am d20d72d1: Merge "revert surfaceflinger leak fix as it uncover...Mathias Agopian2011-06-151-14/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | revert surfaceflinger leak fix as it uncovered a crasher on xoomMathias Agopian2011-06-151-14/+0
| * | | | | | | am a9007fbd: am 69b4587b: DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-06-141-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | DO NOT MERGE. may fix build on some version of gccMathias Agopian2011-06-141-0/+1
| * | | | | | | am 77079399: am a9c9a4ba: fix RefBase so it retains binary-compatibility with...Mathias Agopian2011-06-131-7/+13
| |\ \ \ \ \ \ \ | | |/ / / / / /