tree 1ce0c2be6f4ac96499707d1338516d63a5b6f145
parent 09359d4e7b9186eec9ce744257a8d1dcb6cbbf15
parent 1f3cf60ccb8c7f0b8ab98d2f46ef67a50a98fce0
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