am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1
am 2ba13186: Merge "SurfaceTexture: fix a bug with buffer reallocation" into ics-mr1

* commit '2ba13186b268de3527af6da1933a4b65877548d9':
  SurfaceTexture: fix a bug with buffer reallocation

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