Merge commit '4d4e985673de1fa0bae72df3485af86381c3ec12'
* commit '4d4e985673de1fa0bae72df3485af86381c3ec12':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
Merge commit 'd6e54a902368885072975dd0bad78dcd1cafaaea' into eclair-mr2-plus-aosp
* commit 'd6e54a902368885072975dd0bad78dcd1cafaaea':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
Merge commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d' into eclair-mr2
* commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d':
Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.
Merge commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c'
* commit '8e59b032c34b1b9fe42235ce59c5daaba59ee30c':
Fix layoutlib tests so they pas when run from Eclipse workbench.
Merge commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524' into eclair-mr2-plus-aosp
* commit '4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524':
Fix layoutlib tests so they pas when run from Eclipse workbench.
Merge commit 'c54e0ce964f4d38089def7ecee850a659f84bbe5' into eclair-mr2
* commit 'c54e0ce964f4d38089def7ecee850a659f84bbe5':
Fix layoutlib tests so they pas when run from Eclipse workbench.
Merge commit 'd1d744cdf4b08c8ef969790bae305c82ae783f4e'
* commit 'd1d744cdf4b08c8ef969790bae305c82ae783f4e':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
Merge commit '07d38c66692b7d87415667010c0658202b5a7f39' into eclair-mr2-plus-aosp
* commit '07d38c66692b7d87415667010c0658202b5a7f39':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
Merge commit '8637759a1d34a4adda292579d5f8790587659235' into eclair-mr2
* commit '8637759a1d34a4adda292579d5f8790587659235':
fix[2228133] pixelflinger ignores the "vertical stride" leading to artifacts when playing back video
Follow up to bug 2195678. This was one of the reprocussions that
I was worried about with respect to that bug, so I'm counting
Dr. No on that change as the one for this one.
Merge commit 'c4bbb9144d1955340d69548e7245417cbe862d3c'
* commit 'c4bbb9144d1955340d69548e7245417cbe862d3c':
Rename the term "attribute"/"attr" to "parameter"/param".
Merge commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5' into eclair-mr2-plus-aosp
* commit '6cb76ac37f1b4a36d81db7d7e8652d82b6f1b8b5':
Rename the term "attribute"/"attr" to "parameter"/param".
We had been using "parameter"/"param" by mistake, while both vCard
formats uses theterm "attribute"/"attr". This is confusing.
Internal issue number: 2233884
Merge commit '66da163d4115688a8be7abb96c409a9858f9a8cd' into eclair-mr2-plus-aosp
* commit '66da163d4115688a8be7abb96c409a9858f9a8cd':
Move some useful logic to VCardTestsBase.java
we lost the concept of vertical stride when moving video playback to EGLImage.
Here we bring it back in a somewhat hacky-way that will work only for the
softgl/mdp backend.
Merge commit '763701408b09195a2b82bd088fc83c61b27c9be4'
* commit '763701408b09195a2b82bd088fc83c61b27c9be4':
Add windows media support check in MediaMetadataRetrieverTest
Merge commit 'f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8'
* commit 'f13b7c7f7ce4b1bd14af0280ef51db375eb65fd8':
Suppress takePicture test from continuous DO NOT MERGE.
Merge commit '8559ca18de9cdd60bd8979e641c4fd1a8e66b62e'
* commit '8559ca18de9cdd60bd8979e641c4fd1a8e66b62e':
libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
