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
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".
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
Merge commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8' into eclair-mr2-plus-aosp
* commit '9d4dcf287cb74d8d82a89df8d93301cd9c6b27d8':
Add windows media support check in MediaMetadataRetrieverTest
Merge commit '4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7' into eclair-mr2-plus-aosp
* commit '4aa7e0aae14d2f05afb85bc1e0a7d523ebcb3da7':
Suppress takePicture test from continuous DO NOT MERGE.
Merge commit 'f67eff177515baa421d8717ee20efdc516fde580' into eclair-mr2
* commit 'f67eff177515baa421d8717ee20efdc516fde580':
Add windows media support check in MediaMetadataRetrieverTest
Merge commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80' into eclair-mr2
* commit 'd6af2e0cbf144b091d9c9d1bf2f3061547220c80':
Suppress takePicture test from continuous DO NOT MERGE.
Merge commit '0a5201f01cac963752e0b4635f081c73cb6f1959' into eclair-mr2-plus-aosp
* commit '0a5201f01cac963752e0b4635f081c73cb6f1959':
libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Merge commit 'dfc7244aa874ae31cc13758e1e2cf6112f7a66b4' into eclair-mr2
* commit 'dfc7244aa874ae31cc13758e1e2cf6112f7a66b4':
libbinder: MemoryHeapPmem: honor the NO_CACHING flag when creating a client heap
Merge commit '1150e818727d9a0620ecd5c5f7ef40ce0078c7f4'
* commit '1150e818727d9a0620ecd5c5f7ef40ce0078c7f4':
Add ability to disable sending Photos using Vcard. Do Not Merge
Merge commit '395a20aeed0d7c58c978ed32cf50253280723cac' into eclair-mr2-plus-aosp
* commit '395a20aeed0d7c58c978ed32cf50253280723cac':
Add ability to disable sending Photos using Vcard. Do Not Merge
Merge commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-mr2
* commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992':
Add ability to disable sending Photos using Vcard. Do Not Merge
Merge commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681'
* commit '15ec511b5c5cdb901bf1bd0e26ff0514635fc681':
Fix a build break. Too many branches to keep track of.
Merge commit '8ba42ba83b206929c4c13c0b8ef24de87a92f42c'
* commit '8ba42ba83b206929c4c13c0b8ef24de87a92f42c':
libbinder: add a NO_CACHING flag to MemoryHeapBase
Merge commit 'fb1d992f4b8addad729a94cb006a732a40b62756'
* commit 'fb1d992f4b8addad729a94cb006a732a40b62756':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Merge commit '766df995e30caa054cc25068e55f160c765590eb'
* commit '766df995e30caa054cc25068e55f160c765590eb':
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Merge commit '38f95586a6540756d5de383145b49a8625d49d23' into eclair-mr2-plus-aosp
* commit '38f95586a6540756d5de383145b49a8625d49d23':
Fix a build break. Too many branches to keep track of.
Merge commit '03e778b913adfb450889c51adf042388ada7c5f8' into eclair-mr2
* commit '03e778b913adfb450889c51adf042388ada7c5f8':
Fix a build break. Too many branches to keep track of.
Merge commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82' into eclair-mr2-plus-aosp
* commit 'cd767bfd1c8e3103f99207ecfa34385e76518e82':
libbinder: add a NO_CACHING flag to MemoryHeapBase
Merge commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577' into eclair-mr2-plus-aosp
* commit '1166ff76eb3dbb5304dc40b3056e48c2c9dc7577':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Merge commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b' into eclair-mr2-plus-aosp
* commit 'd31b0e44af38594691440ba1ab5150b1a8f8480b':
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
Merge commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672' into eclair-mr2
* commit 'd4649b2f8ea8285a4eb3c47e87520c7835e6c672':
libbinder: add a NO_CACHING flag to MemoryHeapBase
Merge commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8' into eclair-mr2
* commit '1d9246e8bb8de624e14c55dce57e93da18cfd7a8':
Make sure the visualization stops immediately when sound stops, instead of continuing for a fraction of a second.
Merge commit '3bbb5e9a1e792795dc6965dd399ef78d4e6556cd' into eclair-mr2
* commit '3bbb5e9a1e792795dc6965dd399ef78d4e6556cd':
Fix some leaks. This fixes the major malloc memory leak in allApps. Still tracking some much more minor issues.
