tree dcab5f26dbcffd55cf174aaec6e5533883f5eba8
parent 4899daa0c8e747cd3c0ecf1c6ceeec022f6c7524
parent 338ccf43b6a4468aea6aa7d831be7d6c8d8d134d
author Andreas Huber <andih@google.com> 1257278399 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257278399 -0800

am 338ccf43: Merge change Id2906ad8 into eclair

Merge commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d' into eclair-mr2

* commit '338ccf43b6a4468aea6aa7d831be7d6c8d8d134d':
  Fix video flickering by propagating the NO_CACHING flag from the master to MemoryHeapPMem.