am c6bbc4e7: am 9de61ae0: Merge "Fix video scaling mode validity check." into jb-dev
am c6bbc4e7: am 9de61ae0: Merge "Fix video scaling mode validity check." into jb-dev

* commit 'c6bbc4e70f8fe41dd31de3c8a0e9be0f24961593':
  Fix video scaling mode validity check.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base