am 656f9b6a: Merge "fix a small race condition when returning the default width/height of a SurfaceTexture"
am 656f9b6a: Merge "fix a small race condition when returning the default width/height of a SurfaceTexture"

* commit '656f9b6a1cf7e1e6154959d20c078fb2d98cfc91':
  fix a small race condition when returning the default width/height of a SurfaceTexture

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