am be9a3190: am 10a024bf: am 35e04a1a: Merge "Fix NPE in setSurfaceTexure" into mnc-dev
am be9a3190: am 10a024bf: am 35e04a1a: Merge "Fix NPE in setSurfaceTexure" into mnc-dev

* commit 'be9a31903ef0617915c377c8da7cbf88a22f5cc5':
  Fix NPE in setSurfaceTexure

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