tree 680710afc199c96419fb6afed6044be7767b922f
parent 627b9a3b4014fe6134493ab77e340b07cf4556d2
parent be8cf4a280b0aa786ba1aa3dad85d51125e0a86f
author Jamie Gennis <jgennis@google.com> 1339704779 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339704779 -0700

am be8cf4a2: am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-dev

* commit 'be8cf4a280b0aa786ba1aa3dad85d51125e0a86f':
  stagefright: set scaling mode for blank frames