tree 5f3f5d50dfd05ace2b83f5abd73708d8542e30b7
parent ac6d49fa95f3d255b9ca611ec139dce3fef9d907
parent 05e73de0664765a144414e73d4fcf4e1caf3c0f3
author James Dong <jdong@google.com> 1346811297 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346811297 -0700

am 05e73de0: am 0d268a3c: Add setVideoScalingMode support to NuPlayer

* commit '05e73de0664765a144414e73d4fcf4e1caf3c0f3':
  Add setVideoScalingMode support to NuPlayer