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

* commit '35e04a1adfb763fd3a0cb7a345b37093ce8990a9':
  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