tree f9867ade7070263e6a521531d1ff4e6624618966
parent eca95af88949ec76533927f39118ac57f4f01911
parent 0d268a3cae145afb2720c88ae38fb81550be5584
author James Dong <jdong@google.com> 1346811231 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346811231 -0700

am 0d268a3c: Add setVideoScalingMode support to NuPlayer

* commit '0d268a3cae145afb2720c88ae38fb81550be5584':
  Add setVideoScalingMode support to NuPlayer