tree 0ca015369803b98500731e6c37fefe218e436f57
parent 59dd94d6e19fd961c16c53712e2c39190884218d
parent daaf7b119649674cfc414a8761585fed6b0296df
author James Dong <jdong@google.com> 1335904752 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335904752 -0700

am daaf7b11: Merge "Impl for supporting two video scaling modes" into jb-dev

* commit 'daaf7b119649674cfc414a8761585fed6b0296df':
  Impl for supporting two video scaling modes