tree aeca274c77e975cc9c6acd2500dca0172c1185d4
parent 192cbbad773979a6fe3b5a0c223356de4fc3309c
parent 1d5ac80d0c6d3deabcc9e9b4abc9e3ef536aeb27
author Jamie Gennis <jgennis@google.com> 1339704488 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1339704488 -0700

Merge "stagefright: set scaling mode for blank frames" into jb-dev