am 3451df1a: Merge "Default W, H allowed in SurfaceMediaSource dequeue"
am 3451df1a: Merge "Default W, H allowed in SurfaceMediaSource dequeue"

* commit '3451df1a5cc1547fe1061a482a50a639fcc0e8e4':
  Default W, H allowed in SurfaceMediaSource dequeue

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