summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 09443aeb: am 62884505: Merge "Reset ANativeWindow crop on buffer geometry ...Jamie Gennis2011-01-301-0/+2
|\
| * am 62884505: Merge "Reset ANativeWindow crop on buffer geometry changes." int...Jamie Gennis2011-01-301-0/+2
| |\
| | * Reset ANativeWindow crop on buffer geometry changes.Jamie Gennis2011-01-281-0/+2
* | | am 371de969: am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output f...Dianne Hackborn2011-01-291-0/+1
|\ \ \ | |/ /
| * | am a1f5e82f: am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
| |\ \
| | * \ am a30063d8: am 25eb0464: Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
| | |\ \
| | | * \ Merge "Normalize output from aapt d"Dianne Hackborn2011-01-291-0/+1
| | | |\ \
| | | | * | Normalize output from aapt dShachar Shemesh2011-01-041-0/+1
| | * | | | am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-263-5/+10
| | |\ \ \ \
| | | * | | | do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-263-5/+10
| | * | | | | am 239fd805: Merge "fix [3361121] hang in glClear() - device unresponsive, OT...Mathias Agopian2011-01-251-7/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | fix [3361121] hang in glClear() - device unresponsive, OTA fails (DO NOT MERGE)Mathias Agopian2011-01-251-7/+1
| | * | | | | am d3fcd0a1: Merge "minor clean-up. SurfaceFlinger doesn\'t need libpixelflin...Mathias Agopian2011-01-251-1/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so. (DO NOT MERGE)Mathias Agopian2011-01-251-1/+1
| | * | | | | am 265cf2e7: Merge "Fix getSwitchState."Jeff Brown2011-01-221-0/+9
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Fix getSwitchState.Jeff Brown2011-01-191-0/+9
| | * | | | | am 41395459: Merge "Filter virtual keys after touches. (DO NOT MERGE)" into ...Jeff Brown2011-01-181-0/+17
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "Filter virtual keys after touches. (DO NOT MERGE)" into gingerbreadJeff Brown2011-01-181-0/+17
| | | |\ \ \ \
| | | | * | | | Filter virtual keys after touches. (DO NOT MERGE)Jeff Brown2011-01-111-0/+17
| | * | | | | | merge 83fdc69e from gingerbread - do not mergeJean-Baptiste Queru2011-01-143-62/+10
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Squash commits of the following patches, cherry-picked from other branch - do...James Dong2011-01-123-62/+10
| | | |/ / / /
| | * | | | | am 13d1cb56: Merge "Avoid deadlock in OMX::freeNode by making sure OMXCodecOb...James Dong2011-01-101-2/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold...James Dong2011-01-101-2/+7
* | | | | | | Protected surface APIGlenn Kasten2011-01-282-2/+6
* | | | | | | am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for ti...James Dong2011-01-262-1/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 7fb232c4: Merge "Make sure that key frame is generated for timelapse video...James Dong2011-01-262-1/+5
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Make sure that key frame is generated for timelapse video recording if there ...James Dong2011-01-262-1/+5
* | | | | | | am e328d1c0: am a9f27fa6: Merge "Protect notification callback parameters wit...Andreas Huber2011-01-261-4/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a9f27fa6: Merge "Protect notification callback parameters with a mutex." i...Andreas Huber2011-01-261-4/+14
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Protect notification callback parameters with a mutex.Andreas Huber2011-01-261-4/+14
* | | | | | | am 12b2dc90: am b1e0a870: Merge "Fix crashes caused by some input devices." i...Jeff Brown2011-01-251-1/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b1e0a870: Merge "Fix crashes caused by some input devices." into honeycombJeff Brown2011-01-251-1/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix crashes caused by some input devices." into honeycombJeff Brown2011-01-251-1/+3
| | |\ \ \ \ \
| | | * | | | | Fix crashes caused by some input devices.Jeff Brown2011-01-251-1/+3
* | | | | | | | am c80daa1b: am f10d9404: Merge "StagefrightMediaScanner: Close metadata retr...Mike Lockwood2011-01-251-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am f10d9404: Merge "StagefrightMediaScanner: Close metadata retriever after w...Mike Lockwood2011-01-251-4/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-251-4/+0
| | |/ / / / /
* | | | | | | am 2acb67ec: am 67005b05: Merge "Use optimized display lists for all hwaccele...Chet Haase2011-01-241-0/+33
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 67005b05: Merge "Use optimized display lists for all hwaccelerated renderi...Chet Haase2011-01-241-0/+33
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Use optimized display lists for all hwaccelerated renderingChet Haase2011-01-241-0/+33
* | | | | | | am 3564d9ea: am 63d64a14: Merge "Properly rotate video that\'s marked as such...Andreas Huber2011-01-211-0/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 63d64a14: Merge "Properly rotate video that\'s marked as such and decoded ...Andreas Huber2011-01-211-0/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Properly rotate video that's marked as such and decoded to a surface.Andreas Huber2011-01-211-0/+2
* | | | | | | am 9a62d902: am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviou...Andreas Huber2011-01-211-1/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 05aa0827: Merge "Some tweaks to HTTP live / nuplayer behaviour" into honey...Andreas Huber2011-01-211-1/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Some tweaks to HTTP live / nuplayer behaviourAndreas Huber2011-01-211-1/+4
* | | | | | | am 612d7f3c: am a423d868: Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am a423d868: Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "clean-up unneeded code" into honeycombMathias Agopian2011-01-201-8/+1
| | |\ \ \ \ \
| | | * | | | | clean-up unneeded codeMathias Agopian2011-01-201-8/+1